| Index: media/filters/ffmpeg_demuxer.cc
|
| diff --git a/media/filters/ffmpeg_demuxer.cc b/media/filters/ffmpeg_demuxer.cc
|
| index 7cb05d7c8a2cd58b02ffb073a4b30373294c858e..553e731210da49b854bac73575766c634bd36ae4 100644
|
| --- a/media/filters/ffmpeg_demuxer.cc
|
| +++ b/media/filters/ffmpeg_demuxer.cc
|
| @@ -9,6 +9,7 @@
|
|
|
| #include "base/base64.h"
|
| #include "base/bind.h"
|
| +#include "base/bind_to_current_loop.h"
|
| #include "base/callback.h"
|
| #include "base/callback_helpers.h"
|
| #include "base/memory/scoped_ptr.h"
|
| @@ -21,7 +22,6 @@
|
| #include "base/task_runner_util.h"
|
| #include "base/time/time.h"
|
| #include "media/base/audio_decoder_config.h"
|
| -#include "media/base/bind_to_current_loop.h"
|
| #include "media/base/decoder_buffer.h"
|
| #include "media/base/decrypt_config.h"
|
| #include "media/base/limits.h"
|
| @@ -423,7 +423,7 @@ DemuxerStream::Liveness FFmpegDemuxerStream::liveness() const {
|
| void FFmpegDemuxerStream::Read(const ReadCB& read_cb) {
|
| DCHECK(task_runner_->BelongsToCurrentThread());
|
| CHECK(read_cb_.is_null()) << "Overlapping reads are not supported";
|
| - read_cb_ = BindToCurrentLoop(read_cb);
|
| + read_cb_ = base::BindToCurrentLoop(read_cb);
|
|
|
| // Don't accept any additional reads if we've been told to stop.
|
| // The |demuxer_| may have been destroyed in the pipeline thread.
|
| @@ -677,8 +677,9 @@ void FFmpegDemuxer::Initialize(DemuxerHost* host,
|
| host_ = host;
|
| text_enabled_ = enable_text_tracks;
|
|
|
| - url_protocol_.reset(new BlockingUrlProtocol(data_source_, BindToCurrentLoop(
|
| - base::Bind(&FFmpegDemuxer::OnDataSourceError, base::Unretained(this)))));
|
| + url_protocol_.reset(new BlockingUrlProtocol(data_source_,
|
| + base::BindToCurrentLoop(base::Bind(&FFmpegDemuxer::OnDataSourceError,
|
| + base::Unretained(this)))));
|
| glue_.reset(new FFmpegGlue(url_protocol_.get()));
|
| AVFormatContext* format_context = glue_->format_context();
|
|
|
|
|