Index: trunk/src/media/filters/ffmpeg_video_decoder_unittest.cc |
=================================================================== |
--- trunk/src/media/filters/ffmpeg_video_decoder_unittest.cc (revision 195011) |
+++ trunk/src/media/filters/ffmpeg_video_decoder_unittest.cc (working copy) |
@@ -50,12 +50,14 @@ |
class FFmpegVideoDecoderTest : public testing::Test { |
public: |
FFmpegVideoDecoderTest() |
- : decoder_(new FFmpegVideoDecoder(message_loop_.message_loop_proxy())), |
+ : decoder_(NULL), |
demuxer_(new StrictMock<MockDemuxerStream>()), |
read_cb_(base::Bind(&FFmpegVideoDecoderTest::FrameReady, |
base::Unretained(this))) { |
FFmpegGlue::InitializeFFmpeg(); |
+ decoder_ = new FFmpegVideoDecoder(message_loop_.message_loop_proxy()); |
+ |
// Initialize various test buffers. |
frame_buffer_.reset(new uint8[kCodedSize.GetArea()]); |
end_of_stream_buffer_ = DecoderBuffer::CreateEOSBuffer(); |
@@ -199,7 +201,7 @@ |
const scoped_refptr<VideoFrame>&)); |
MessageLoop message_loop_; |
- scoped_ptr<FFmpegVideoDecoder> decoder_; |
+ scoped_refptr<FFmpegVideoDecoder> decoder_; |
scoped_refptr<StrictMock<MockDemuxerStream> > demuxer_; |
MockStatisticsCB statistics_cb_; |
VideoDecoderConfig config_; |