diff options
| author | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-23 23:34:15 +0000 |
|---|---|---|
| committer | ajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-12-23 23:34:15 +0000 |
| commit | 4a436845bb42ca32639041a7857b8eaa1eb722e1 (patch) | |
| tree | 15d83192806475579b0d93b407e3ea8a6378a9bb /media | |
| parent | 2597767f106b108ed7d0b9d5d66803a9a67831e5 (diff) | |
| download | chromium_src-4a436845bb42ca32639041a7857b8eaa1eb722e1.zip chromium_src-4a436845bb42ca32639041a7857b8eaa1eb722e1.tar.gz chromium_src-4a436845bb42ca32639041a7857b8eaa1eb722e1.tar.bz2 | |
Retry r35228: Fix windows build due to missing mock ffmpeg entry points.
Original Review URL: http://codereview.chromium.org/522004
TBR: levin
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35238 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media')
| -rw-r--r-- | media/base/mock_ffmpeg.cc | 5 | ||||
| -rw-r--r-- | media/base/mock_ffmpeg.h | 1 |
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, |