| Index: media/filters/ffmpeg_video_decoder.h
|
| diff --git a/media/filters/ffmpeg_video_decoder.h b/media/filters/ffmpeg_video_decoder.h
|
| index cd60c2e2a6ccb59ee2f1476682b8fec96c93995b..9ff153f4dea88009584542c80c7ec1a4cad3171c 100644
|
| --- a/media/filters/ffmpeg_video_decoder.h
|
| +++ b/media/filters/ffmpeg_video_decoder.h
|
| @@ -7,6 +7,7 @@
|
|
|
| #include <deque>
|
|
|
| +#include "base/callback.h"
|
| #include "base/memory/scoped_ptr.h"
|
| #include "media/base/filters.h"
|
| #include "media/crypto/aes_decryptor.h"
|
| @@ -21,7 +22,7 @@ namespace media {
|
|
|
| class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
|
| public:
|
| - explicit FFmpegVideoDecoder(MessageLoop* message_loop);
|
| + FFmpegVideoDecoder(const base::Callback<MessageLoop*()>& message_loop_cb);
|
| virtual ~FFmpegVideoDecoder();
|
|
|
| // Filter implementation.
|
| @@ -68,6 +69,9 @@ class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder {
|
| // the current state of |codec_context_|.
|
| scoped_refptr<VideoFrame> AllocateVideoFrame();
|
|
|
| + // This is !is_null() iff Initialize() hasn't been called.
|
| + base::Callback<MessageLoop*()> message_loop_factory_cb_;
|
| +
|
| MessageLoop* message_loop_;
|
|
|
| DecoderState state_;
|
|
|