Created battor.tough_energy_cases (without dcurtis's change)

media/filters/ffmpeg_demuxer.h

Index: media/filters/ffmpeg_demuxer.h
diff --git a/media/filters/ffmpeg_demuxer.h b/media/filters/ffmpeg_demuxer.h
index 4c06c4c97e6115ca3f1364a64bb8d998f12b1b8e..a5b15bc6d9618095c4be3a8507136b927babc519 100644
--- a/media/filters/ffmpeg_demuxer.h
+++ b/media/filters/ffmpeg_demuxer.h
@@ -32,9 +32,7 @@
 
 #include "base/callback.h"
 #include "base/macros.h"
-#include "base/memory/weak_ptr.h"
-#include "base/sequenced_task_runner.h"
-#include "base/single_thread_task_runner.h"
+#include "base/threading/thread.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/decoder_buffer.h"
 #include "media/base/decoder_buffer_queue.h"
@@ -297,12 +295,8 @@ class MEDIA_EXPORT FFmpegDemuxer : public Demuxer {
 
   scoped_refptr<base::SingleThreadTaskRunner> task_runner_;
 
-  // Task runner on which all blocking FFmpeg operations are executed; retrieved
-  // from base::TaskScheduler.
-  scoped_refptr<base::SequencedTaskRunner> blocking_task_runner_;
-
-  // Indicates if Stop() has been called.
-  bool stopped_;
+  // Thread on which all blocking FFmpeg operations are executed.
+  base::Thread blocking_thread_;
 
   // Tracks if there's an outstanding av_read_frame() operation.
   //