diff options
| author | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-24 00:39:20 +0000 |
|---|---|---|
| committer | scherkus@chromium.org <scherkus@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-24 00:39:20 +0000 |
| commit | a802823900580c9cb7a137e2fdb1d430a7348a67 (patch) | |
| tree | 7b954d4673f1ec641dbb761c9a4af9aa56b4fdd5 /media/base | |
| parent | 6b3a68eb95fc52475f117b49084efce01c0f1d09 (diff) | |
| download | chromium_src-a802823900580c9cb7a137e2fdb1d430a7348a67.zip chromium_src-a802823900580c9cb7a137e2fdb1d430a7348a67.tar.gz chromium_src-a802823900580c9cb7a137e2fdb1d430a7348a67.tar.bz2 | |
Removed custom FFmpegLock. Removed ffmpeg headers from third_party/ffmpeg/include.
Patch by sergeyu@chromium.org
BUG=23271
TEST=none
Review URL: http://codereview.chromium.org/1213002
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42415 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base')
| -rw-r--r-- | media/base/mock_ffmpeg.cc | 10 | ||||
| -rw-r--r-- | media/base/mock_ffmpeg.h | 1 |
2 files changed, 11 insertions, 0 deletions
diff --git a/media/base/mock_ffmpeg.cc b/media/base/mock_ffmpeg.cc index 0d872068..9c30938 100644 --- a/media/base/mock_ffmpeg.cc +++ b/media/base/mock_ffmpeg.cc @@ -92,6 +92,16 @@ void av_register_all() { media::MockFFmpeg::get()->AVRegisterAll(); } +int av_lockmgr_register(int (*cb)(void**, enum AVLockOp)) { + media::MockFFmpeg* mock = media::MockFFmpeg::get(); + // Here |mock| may be NULL when this function is called from ~FFmpegGlue(). + if (mock != NULL) { + return media::MockFFmpeg::get()->AVRegisterLockManager(cb); + } else { + return 0; + } +} + AVCodec* avcodec_find_decoder(enum CodecID id) { return media::MockFFmpeg::get()->AVCodecFindDecoder(id); } diff --git a/media/base/mock_ffmpeg.h b/media/base/mock_ffmpeg.h index a4a9f1a..836e02b 100644 --- a/media/base/mock_ffmpeg.h +++ b/media/base/mock_ffmpeg.h @@ -21,6 +21,7 @@ class MockFFmpeg { MOCK_METHOD0(AVCodecInit, void()); MOCK_METHOD1(AVRegisterProtocol, int(URLProtocol* protocol)); MOCK_METHOD0(AVRegisterAll, void()); + MOCK_METHOD1(AVRegisterLockManager, int(int (*cb)(void**, enum AVLockOp))); MOCK_METHOD1(AVCodecFindDecoder, AVCodec*(enum CodecID id)); MOCK_METHOD2(AVCodecOpen, int(AVCodecContext* avctx, AVCodec* codec)); |