summaryrefslogtreecommitdiffstats
path: root/media/video/picture.h
diff options
context:
space:
mode:
authorapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-05 03:20:24 +0000
committerapatrick@chromium.org <apatrick@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-08-05 03:20:24 +0000
commitae8ada214634d9d28f1b3a2a1938111cb59f32af (patch)
treee6a535cf84b26286d4df70e4c9298cd3d5a0cd57 /media/video/picture.h
parente5554b3f4dad9dccb3d56658a5d20ec57b567170 (diff)
downloadchromium_src-ae8ada214634d9d28f1b3a2a1938111cb59f32af.zip
chromium_src-ae8ada214634d9d28f1b3a2a1938111cb59f32af.tar.gz
chromium_src-ae8ada214634d9d28f1b3a2a1938111cb59f32af.tar.bz2
Revert 95496 - Create media.dll
Review URL: http://codereview.chromium.org/7523051 TBR=darin@chromium.org Review URL: http://codereview.chromium.org/7491048 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@95561 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/video/picture.h')
-rw-r--r--media/video/picture.h5
1 files changed, 2 insertions, 3 deletions
diff --git a/media/video/picture.h b/media/video/picture.h
index e3ecb9e..10cf47c 100644
--- a/media/video/picture.h
+++ b/media/video/picture.h
@@ -6,7 +6,6 @@
#define MEDIA_VIDEO_PICTURE_H_
#include "base/basictypes.h"
-#include "media/base/media_export.h"
#include "ui/gfx/gl/gl_context.h"
#include "ui/gfx/size.h"
@@ -14,7 +13,7 @@ namespace media {
// A picture buffer that is composed of a GLES2 texture.
// This is the media-namespace equivalent of PP_PictureBuffer_Dev.
-class MEDIA_EXPORT PictureBuffer {
+class PictureBuffer {
public:
PictureBuffer(int32 id, gfx::Size size, uint32 texture_id);
@@ -43,7 +42,7 @@ class MEDIA_EXPORT PictureBuffer {
// A decoded picture frame.
// This is the media-namespace equivalent of PP_Picture_Dev.
-class MEDIA_EXPORT Picture {
+class Picture {
public:
Picture(int32 picture_buffer_id, int32 bitstream_buffer_id);