Index: media/filters/vpx_video_decoder.h |
diff --git a/media/filters/vpx_video_decoder.h b/media/filters/vpx_video_decoder.h |
index 77578fdc90f7e6c82de90090cadff43857e1a886..179d465a3dace9d934d612d6960b3bde03242043 100644 |
--- a/media/filters/vpx_video_decoder.h |
+++ b/media/filters/vpx_video_decoder.h |
@@ -9,6 +9,7 @@ |
#include "base/memory/ref_counted.h" |
#include "media/base/demuxer_stream.h" |
#include "media/base/video_decoder.h" |
+#include "media/base/video_frame.h" |
struct vpx_codec_ctx; |
struct vpx_image; |
@@ -62,7 +63,8 @@ class MEDIA_EXPORT VpxVideoDecoder : public VideoDecoder { |
// Reset decoder and call |reset_cb_|. |
void DoReset(); |
- void CopyVpxImageTo(const vpx_image* vpx_image, |
+ void CopyVpxImageTo(const struct vpx_image* vpx_image, |
scherkus (not reviewing)
2013/04/17 19:15:37
nit: c++ doesn't need struct keyword
vignesh
2013/04/17 20:14:23
Done.
|
+ const struct vpx_image* vpx_image_alpha, |
scoped_refptr<VideoFrame>* video_frame); |
scoped_refptr<base::MessageLoopProxy> message_loop_; |
@@ -77,6 +79,7 @@ class MEDIA_EXPORT VpxVideoDecoder : public VideoDecoder { |
scoped_refptr<DemuxerStream> demuxer_stream_; |
vpx_codec_ctx* vpx_codec_; |
+ vpx_codec_ctx* vpx_codec_alpha_; |
DISALLOW_COPY_AND_ASSIGN(VpxVideoDecoder); |
}; |