diff options
| author | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-03 00:19:16 +0000 |
|---|---|---|
| committer | rsleevi@chromium.org <rsleevi@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2013-06-03 00:19:16 +0000 |
| commit | 5b7ca42829a3aedcbb5ac4e6d7832649e8daea12 (patch) | |
| tree | ad189d3a326f2aed6a4f0b433881d2f174b38c97 /media/tools | |
| parent | d33c744151eacb1959b3c7cb86e127d34e03045b (diff) | |
| download | chromium_src-5b7ca42829a3aedcbb5ac4e6d7832649e8daea12.zip chromium_src-5b7ca42829a3aedcbb5ac4e6d7832649e8daea12.tar.gz chromium_src-5b7ca42829a3aedcbb5ac4e6d7832649e8daea12.tar.bz2 | |
Update media/ to use scoped_refptr<T>::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
Diffstat (limited to 'media/tools')
| -rw-r--r-- | media/tools/demuxer_bench/demuxer_bench.cc | 2 | ||||
| -rw-r--r-- | media/tools/player_x11/player_x11.cc | 2 |
2 files changed, 2 insertions, 2 deletions
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<media::DecoderBuffer>& 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) {} |