Revert 194993 "Remove reference counting from media::VideoDecode..."

trunk/src/media/tools/player_x11/player_x11.cc

Index: trunk/src/media/tools/player_x11/player_x11.cc
===================================================================
--- trunk/src/media/tools/player_x11/player_x11.cc	(revision 195011)
+++ trunk/src/media/tools/player_x11/player_x11.cc	(working copy)
@@ -113,13 +113,12 @@
   media::FFmpegNeedKeyCB need_key_cb = base::Bind(&NeedKey);
   collection->SetDemuxer(new media::FFmpegDemuxer(message_loop, data_source,
                                                   need_key_cb));
+  collection->GetVideoDecoders()->push_back(new media::FFmpegVideoDecoder(
+      message_loop));
 
-
-  ScopedVector<media::VideoDecoder> video_decoders;
-  video_decoders.push_back(new media::FFmpegVideoDecoder(message_loop));
+  // Create our video renderer and save a reference to it for painting.
   scoped_ptr<media::VideoRenderer> video_renderer(new media::VideoRendererBase(
       message_loop,
-      video_decoders.Pass(),
       media::SetDecryptorReadyCB(),
       base::Bind(&Paint, paint_message_loop, paint_cb),
       base::Bind(&SetOpaque),