From 1ab1c24bda1b30b57e040b3b077a001d095fcab3 Mon Sep 17 00:00:00 2001 From: "scherkus@chromium.org" Date: Wed, 21 Sep 2011 22:44:04 +0000 Subject: Introduce AudioDecoderConfig to migrate away from GetAVStream(). Instead add DemuxerStream::audio_decoder_config() to break FFmpegAudioDecoder's dependency on the AVCodecContext object maintained by FFmpegDemuxer. Review URL: http://codereview.chromium.org/7867051 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@102183 0039d316-1c4b-4281-b951-d872f2087c98 --- media/video/ffmpeg_video_decode_engine_unittest.cc | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'media/video') diff --git a/media/video/ffmpeg_video_decode_engine_unittest.cc b/media/video/ffmpeg_video_decode_engine_unittest.cc index e8238ff..8e171e1 100644 --- a/media/video/ffmpeg_video_decode_engine_unittest.cc +++ b/media/video/ffmpeg_video_decode_engine_unittest.cc @@ -149,8 +149,10 @@ TEST_F(FFmpegVideoDecodeEngineTest, Initialize_Normal) { } TEST_F(FFmpegVideoDecodeEngineTest, Initialize_FindDecoderFails) { - VideoDecoderConfig config(kUnknown, kCodedSize, kVisibleRect, kNaturalSize, - kFrameRate.num, kFrameRate.den, NULL, 0); + VideoDecoderConfig config(kUnknownVideoCodec, kCodedSize, kVisibleRect, + kNaturalSize, kFrameRate.num, kFrameRate.den, + NULL, 0); + // Test avcodec_find_decoder() returning NULL. VideoCodecInfo info; EXPECT_CALL(*this, OnInitializeComplete(_)) -- cgit v1.1