| Index: media/filters/ffmpeg_demuxer.cc
|
| diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
|
| index 7c4f763c19650319f2e4ca3fd82832b431f6ab91..8d5b840c78ff9a5992367a2e33bc13ae87d86a5d 100644
|
| --- a/media/filters/ffmpeg_demuxer.cc
|
| +++ b/media/filters/ffmpeg_demuxer.cc
|
| @@ -239,12 +239,14 @@ base::TimeDelta FFmpegDemuxerStream::ConvertStreamTimestamp(
|
| //
|
| // FFmpegDemuxer
|
| //
|
| -FFmpegDemuxer::FFmpegDemuxer()
|
| - : format_context_(NULL),
|
| +FFmpegDemuxer::FFmpegDemuxer(MessageLoop* message_loop)
|
| + : message_loop_(message_loop),
|
| + format_context_(NULL),
|
| read_event_(false, false),
|
| read_has_failed_(false),
|
| last_read_bytes_(0),
|
| read_position_(0) {
|
| + DCHECK(message_loop_);
|
| }
|
|
|
| FFmpegDemuxer::~FFmpegDemuxer() {
|
| @@ -391,6 +393,10 @@ bool FFmpegDemuxer::IsStreaming() {
|
| return data_source_->IsStreaming();
|
| }
|
|
|
| +MessageLoop* FFmpegDemuxer::message_loop() {
|
| + return message_loop_;
|
| +}
|
| +
|
| void FFmpegDemuxer::InitializeTask(DataSource* data_source,
|
| FilterCallback* callback) {
|
| DCHECK_EQ(MessageLoop::current(), message_loop());
|
|
|