From 5b7ca42829a3aedcbb5ac4e6d7832649e8daea12 Mon Sep 17 00:00:00 2001 From: "rsleevi@chromium.org" Date: Mon, 3 Jun 2013 00:19:16 +0000 Subject: Update media/ to use scoped_refptr::get() rather than implicit "operator T*" Linux fixes BUG=110610 TBR=darin Review URL: https://chromiumcodereview.appspot.com/16297002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@203650 0039d316-1c4b-4281-b951-d872f2087c98 --- media/tools/demuxer_bench/demuxer_bench.cc | 2 +- media/tools/player_x11/player_x11.cc | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'media/tools') diff --git a/media/tools/demuxer_bench/demuxer_bench.cc b/media/tools/demuxer_bench/demuxer_bench.cc index 707b1b5..d997eaa 100644 --- a/media/tools/demuxer_bench/demuxer_bench.cc +++ b/media/tools/demuxer_bench/demuxer_bench.cc @@ -143,7 +143,7 @@ void StreamReader::OnReadDone( media::DemuxerStream::Status status, const scoped_refptr& buffer) { CHECK_EQ(status, media::DemuxerStream::kOk); - CHECK(buffer); + CHECK(buffer.get()); *end_of_stream = buffer->IsEndOfStream(); *timestamp = *end_of_stream ? media::kNoTimestamp() : buffer->GetTimestamp(); message_loop->PostTask(FROM_HERE, base::MessageLoop::QuitWhenIdleClosure()); diff --git a/media/tools/player_x11/player_x11.cc b/media/tools/player_x11/player_x11.cc index 711bf5c..80357a2 100644 --- a/media/tools/player_x11/player_x11.cc +++ b/media/tools/player_x11/player_x11.cc @@ -90,7 +90,7 @@ void Paint(base::MessageLoop* message_loop, const PaintCB& paint_cb, return; } - paint_cb.Run(video_frame); + paint_cb.Run(video_frame.get()); } static void OnBufferingState(media::Pipeline::BufferingState buffering_state) {} -- cgit v1.1