summaryrefslogtreecommitdiffstats
path: root/media
diff options
context:
space:
mode:
authorajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-23 20:10:44 +0000
committerajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-23 20:10:44 +0000
commit75b0783593e014622355529bd899e689a876ee9a (patch)
tree2d5169812d877f0cf0194ca8b2b5843aaaca5b72 /media
parent921a31d77870b86b4640f25a9c51fbeba07ab4b5 (diff)
downloadchromium_src-75b0783593e014622355529bd899e689a876ee9a.zip
chromium_src-75b0783593e014622355529bd899e689a876ee9a.tar.gz
chromium_src-75b0783593e014622355529bd899e689a876ee9a.tar.bz2
Fix windows build due to missing mock ffmpeg entry points.
Review URL: http://codereview.chromium.org/522004 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35228 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
-rw-r--r--media/base/mock_ffmpeg.cc5
-rw-r--r--media/base/mock_ffmpeg.h1
2 files changed, 6 insertions, 0 deletions
diff --git a/media/base/mock_ffmpeg.cc b/media/base/mock_ffmpeg.cc
index 40be225..2422dd9 100644
--- a/media/base/mock_ffmpeg.cc
+++ b/media/base/mock_ffmpeg.cc
@@ -204,6 +204,11 @@ int av_dup_packet(AVPacket* packet) {
void av_log_set_level(int level) {
media::MockFFmpeg::get()->AVLogSetLevel(level);
}
+
+void av_destruct_packet(AVPacket *pkt) {
+ media::MockFFmpeg::get()->AVDestructPacket(pkt);
+}
+
} // extern "C"
} // namespace media
diff --git a/media/base/mock_ffmpeg.h b/media/base/mock_ffmpeg.h
index 4a7de2b..99c9c086 100644
--- a/media/base/mock_ffmpeg.h
+++ b/media/base/mock_ffmpeg.h
@@ -38,6 +38,7 @@ class MockFFmpeg {
const char* args, uint8_t** poutbuf, int* poutbuf_size,
const uint8_t* buf, int buf_size, int keyframe));
MOCK_METHOD1(AVBitstreamFilterClose, void(AVBitStreamFilterContext* bsf));
+ MOCK_METHOD1(AVDestructPacket, void(AVPacket* packet));
MOCK_METHOD5(AVOpenInputFile, int(AVFormatContext** format,
const char* filename,