| Index: media/filters/ffmpeg_video_decoder.h
|
| diff --git a/media/filters/ffmpeg_video_decoder.h b/media/filters/ffmpeg_video_decoder.h
|
| index 493d8e33e1e2b55f554705b2135e5bf188ed73e8..a48e3b4b841024db0d326e907c7c313ad4aec8fb 100644
|
| --- a/media/filters/ffmpeg_video_decoder.h
|
| +++ b/media/filters/ffmpeg_video_decoder.h
|
| @@ -11,18 +11,22 @@
|
| #include "media/base/demuxer_stream.h"
|
| #include "media/base/video_decoder.h"
|
|
|
| -class MessageLoop;
|
| -
|
| struct AVCodecContext;
|
| struct AVFrame;
|
|
|
| +namespace base {
|
| +class MessageLoopProxy;
|
| +}
|
| +
|
| namespace media {
|
|
|
| class DecoderBuffer;
|
|
|
| class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
|
| public:
|
| - FFmpegVideoDecoder(const base::Callback<MessageLoop*()>& message_loop_cb,
|
| + typedef base::Callback<
|
| + scoped_refptr<base::MessageLoopProxy>()> MessageLoopFactoryCB;
|
| + FFmpegVideoDecoder(const MessageLoopFactoryCB& message_loop_factory_cb,
|
| Decryptor* decryptor);
|
|
|
| // VideoDecoder implementation.
|
| @@ -87,9 +91,9 @@ class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
|
| void DoStop();
|
|
|
| // This is !is_null() iff Initialize() hasn't been called.
|
| - base::Callback<MessageLoop*()> message_loop_factory_cb_;
|
| + MessageLoopFactoryCB message_loop_factory_cb_;
|
|
|
| - MessageLoop* message_loop_;
|
| + scoped_refptr<base::MessageLoopProxy> message_loop_;
|
|
|
| DecoderState state_;
|
|
|
|
|