summaryrefslogtreecommitdiffstats
path: root/media/base/mock_ffmpeg.h
diff options
context:
space:
mode:
authorscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-11 22:31:24 +0000
committerscherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-03-11 22:31:24 +0000
commit0b5f7e52bab18455a11ea763ae424f30755dc20f (patch)
treeddcfd55906e694285269a2bf683175d2320cab95 /media/base/mock_ffmpeg.h
parent33cdc9b854044864f7494c23a21f78733a961236 (diff)
downloadchromium_src-0b5f7e52bab18455a11ea763ae424f30755dc20f.zip
chromium_src-0b5f7e52bab18455a11ea763ae424f30755dc20f.tar.gz
chromium_src-0b5f7e52bab18455a11ea763ae424f30755dc20f.tar.bz2
Remove FFmpegVideoDecodeEngine's dependency on AVStream (again).
First step of many towards removing DemuxerStream::QueryInterface, AVStreamProvider, and MediaFormat. This time without memory leaks! BUG=28206 TEST=media_unittests git-svn-id: svn://svn.chromium.org/chrome/trunk/src@77875 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/mock_ffmpeg.h')
-rw-r--r--media/base/mock_ffmpeg.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/media/base/mock_ffmpeg.h b/media/base/mock_ffmpeg.h
index 89402fe..b004aa4 100644
--- a/media/base/mock_ffmpeg.h
+++ b/media/base/mock_ffmpeg.h
@@ -28,6 +28,7 @@ class MockFFmpeg {
MOCK_METHOD1(AVCodecClose, int(AVCodecContext* avctx));
MOCK_METHOD2(AVCodecThreadInit, int(AVCodecContext* avctx, int threads));
MOCK_METHOD1(AVCodecFlushBuffers, void(AVCodecContext* avctx));
+ MOCK_METHOD0(AVCodecAllocContext, AVCodecContext*());
MOCK_METHOD0(AVCodecAllocFrame, AVFrame*());
MOCK_METHOD4(AVCodecDecodeVideo2,
int(AVCodecContext* avctx, AVFrame* picture,