summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-23 20:26:36 +0000
committerajwong@chromium.org <ajwong@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2009-12-23 20:26:36 +0000
commita8c33bc7ceb15a971e04133032f80561e08e9b29 (patch)
tree9b5efa4e9e5bdf150c837298dc963cb311ba5699
parent75b0783593e014622355529bd899e689a876ee9a (diff)
downloadchromium_src-a8c33bc7ceb15a971e04133032f80561e08e9b29.zip
chromium_src-a8c33bc7ceb15a971e04133032f80561e08e9b29.tar.gz
chromium_src-a8c33bc7ceb15a971e04133032f80561e08e9b29.tar.bz2
TBR: levin
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@35229 0039d316-1c4b-4281-b951-d872f2087c98
-rw-r--r--media/base/mock_ffmpeg.cc5
-rw-r--r--media/base/mock_ffmpeg.h1
2 files changed, 0 insertions, 6 deletions
diff --git a/media/base/mock_ffmpeg.cc b/media/base/mock_ffmpeg.cc
index 2422dd9..40be225 100644
--- a/media/base/mock_ffmpeg.cc
+++ b/media/base/mock_ffmpeg.cc
@@ -204,11 +204,6 @@ 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 99c9c086..4a7de2b 100644
--- a/media/base/mock_ffmpeg.h
+++ b/media/base/mock_ffmpeg.h
@@ -38,7 +38,6 @@ 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,