Revert 41386 - Removed custom FFmpegLock. Removed ffmpeg headers from third_p...

media/base/mock_ffmpeg.cc

Index: media/base/mock_ffmpeg.cc
===================================================================
--- media/base/mock_ffmpeg.cc	(revision 41387)
+++ media/base/mock_ffmpeg.cc	(working copy)
@@ -92,16 +92,6 @@
   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);
 }