summaryrefslogtreecommitdiffstats
path: root/media/tools
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-05 00:56:27 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-05 00:56:27 +0000
commit30ef6b3943c6c788f701002eaf25a45b97c32e72 (patch)
tree55e0b727ad2d11c38f3e741a80425d42f2abeb64 /media/tools
parent90ba0b7405b7226d7702b633b927d389487a73ec (diff)
downloadchromium_src-30ef6b3943c6c788f701002eaf25a45b97c32e72.zip
chromium_src-30ef6b3943c6c788f701002eaf25a45b97c32e72.tar.gz
chromium_src-30ef6b3943c6c788f701002eaf25a45b97c32e72.tar.bz2
Remove reference counting from media::VideoRenderer and friends.
BUG=173313 Review URL: https://codereview.chromium.org/12114024 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@180591 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/tools')
-rw-r--r--media/tools/player_x11/player_x11.cc3
1 files changed, 2 insertions, 1 deletions
diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc
index aca065d..7128479 100644
--- a/media/tools/player_x11/player_x11.cc
+++ b/media/tools/player_x11/player_x11.cc
@@ -111,12 +111,13 @@ bool InitPipeline(const scoped_refptr<base::MessageLoopProxy>& message_loop,
message_loop));
// Create our video renderer and save a reference to it for painting.
- collection->AddVideoRenderer(new media::VideoRendererBase(
+ scoped_ptr<media::VideoRenderer> video_renderer(new media::VideoRendererBase(
message_loop,
media::SetDecryptorReadyCB(),
base::Bind(&Paint, paint_message_loop, paint_cb),
base::Bind(&SetOpaque),
true));
+ collection->SetVideoRenderer(video_renderer.Pass());
collection->AddAudioRenderer(new media::AudioRendererImpl(
message_loop,