diff options
| author | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 03:42:09 +0000 |
|---|---|---|
| committer | jrg@chromium.org <jrg@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2010-03-12 03:42:09 +0000 |
| commit | 5e3e47065c478279a2a3a56c9063405c2e812927 (patch) | |
| tree | c4693e4edc51df3df331fe0d1fe5b17ab5198ed0 /media/base/mock_ffmpeg.cc | |
| parent | 58dd56d1be3b5b4dcba851aebd59b8d3645685e8 (diff) | |
| download | chromium_src-5e3e47065c478279a2a3a56c9063405c2e812927.zip chromium_src-5e3e47065c478279a2a3a56c9063405c2e812927.tar.gz chromium_src-5e3e47065c478279a2a3a56c9063405c2e812927.tar.bz2 | |
Revert 41386 - Removed custom FFmpegLock. Removed ffmpeg headers from third_party/ffmpeg/include.
Bot unhappy
Automatic: "media_unittests" on "Vista Tests" from 41386: ... scherkus@chromium.org ...
http://chrome-buildbot:8010/builders/Vista%20Tests/builds/17009/steps/media_unittests/logs/stdio
Patch by sergeyu@chromium.org
BUG=23271
TEST=none
Review URL: http://codereview.chromium.org/909002
TBR=scherkus@chromium.org
Review URL: http://codereview.chromium.org/854006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@41389 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'media/base/mock_ffmpeg.cc')
| -rw-r--r-- | media/base/mock_ffmpeg.cc | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/media/base/mock_ffmpeg.cc b/media/base/mock_ffmpeg.cc index 9c30938..0d872068 100644 --- a/media/base/mock_ffmpeg.cc +++ b/media/base/mock_ffmpeg.cc @@ -92,16 +92,6 @@ 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); } |