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

media/filters/ffmpeg_video_decode_engine.cc

Index: media/filters/ffmpeg_video_decode_engine.cc
===================================================================
--- media/filters/ffmpeg_video_decode_engine.cc	(revision 41387)
+++ media/filters/ffmpeg_video_decode_engine.cc	(working copy)
@@ -47,13 +47,17 @@
   codec_context_->error_concealment = FF_EC_GUESS_MVS | FF_EC_DEBLOCK;
   codec_context_->error_recognition = FF_ER_CAREFUL;
 
+  // Serialize calls to avcodec_open().
   AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
-  if (codec &&
-      avcodec_thread_init(codec_context_, kDecodeThreads) >= 0 &&
-      avcodec_open(codec_context_, codec) >= 0) {
-    state_ = kNormal;
-  } else {
-    state_ = kError;
+  {
+    AutoLock auto_lock(FFmpegLock::get()->lock());
+    if (codec &&
+        avcodec_thread_init(codec_context_, kDecodeThreads) >= 0 &&
+        avcodec_open(codec_context_, codec) >= 0) {
+      state_ = kNormal;
+    } else {
+      state_ = kError;
+    }
   }
 }