From 5e3e47065c478279a2a3a56c9063405c2e812927 Mon Sep 17 00:00:00 2001 From: "jrg@chromium.org" Date: Fri, 12 Mar 2010 03:42:09 +0000 Subject: 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 --- media/base/mock_ffmpeg.cc | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'media/base/mock_ffmpeg.cc') 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); } -- cgit v1.1