Revert 113895 - <video> decode in hardware!

content/renderer/media/capture_video_decoder.h

Index: content/renderer/media/capture_video_decoder.h
===================================================================
--- content/renderer/media/capture_video_decoder.h	(revision 113906)
+++ content/renderer/media/capture_video_decoder.h	(working copy)
@@ -9,7 +9,6 @@
 #include "content/common/content_export.h"
 #include "media/base/demuxer_stream.h"
 #include "media/base/filters.h"
-#include "media/base/pipeline_status.h"
 #include "media/base/video_frame.h"
 #include "media/video/capture/video_capture.h"
 
@@ -42,7 +41,7 @@
   // Decoder implementation.
   virtual void Initialize(
       media::DemuxerStream* demuxer_stream,
-      const media::PipelineStatusCB& filter_callback,
+      const base::Closure& filter_callback,
       const media::StatisticsCallback& stat_callback) OVERRIDE;
   virtual void Read(const ReadCB& callback) OVERRIDE;
   virtual const gfx::Size& natural_size() OVERRIDE;
@@ -79,7 +78,7 @@
 
   void InitializeOnDecoderThread(
       media::DemuxerStream* demuxer_stream,
-      const media::PipelineStatusCB& filter_callback,
+      const base::Closure& filter_callback,
       const media::StatisticsCallback& stat_callback);
   void ReadOnDecoderThread(const ReadCB& callback);
 
Property changes on: content/renderer/media/capture_video_decoder.h
___________________________________________________________________
Added: svn:mergeinfo