Revert 42415 - 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

TBR=scherkus@chromium.org
Review URL: http://codereview.chromium.org/1240002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@42422 0039d316-1c4b-4281-b951-d872f2087c98

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);
 }