Chromium Code Reviews| Index: media/filters/ffmpeg_video_decoder.h |
| diff --git a/media/filters/ffmpeg_video_decoder.h b/media/filters/ffmpeg_video_decoder.h |
| index 1e9f74d9fa3fc3384e2835d0594af86dfcdacaae..f300660ee6a9da40cfb7cc766394c1a9f5ad3210 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" |
| @@ -19,9 +20,11 @@ struct AVFrame; |
| namespace media { |
| +class MessageLoopFactory; |
|
Ami GONE FROM CHROMIUM
2012/03/09 16:15:06
unnecessary
tommi (sloooow) - chröme
2012/03/11 18:49:36
Done.
|
| + |
| 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 +71,8 @@ class MEDIA_EXPORT FFmpegVideoDecoder : public VideoDecoder { |
| // the current state of |codec_context_|. |
| scoped_refptr<VideoFrame> AllocateVideoFrame(); |
| + base::Callback<MessageLoop*()> message_loop_cb_; |
|
Ami GONE FROM CHROMIUM
2012/03/09 16:15:06
s/message_loop_cb_/message_loop_factory_cb_/
and a
tommi (sloooow) - chröme
2012/03/11 18:49:36
Done.
|
| + |
| MessageLoop* message_loop_; |
| DecoderState state_; |