Removed custom FFmpegLock. Removed ffmpeg headers from third_party/ffmpeg/include.

media/filters/ffmpeg_glue.cc

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "base/string_util.h"
 #include "media/base/filters.h"
 #include "media/ffmpeg/ffmpeg_common.h"
 #include "media/filters/ffmpeg_glue.h"
 
 namespace {
@@ skipping 63 matching lines @@
   if (new_offset < 0)
     new_offset = AVERROR_IO;
   return new_offset;
 }
 
 int CloseContext(URLContext* h) {
   h->priv_data = NULL;
   return 0;
 }
 
+int LockManagerOperation(void** lock, enum AVLockOp op) {
+  switch (op) {
+    case AV_LOCK_CREATE:
+      *lock = new Lock();
+      if (!*lock)
+        return 1;
+      return 0;
+
+    case AV_LOCK_OBTAIN:
+      static_cast<Lock*>(*lock)->Acquire();
+      return 0;
+
+    case AV_LOCK_RELEASE:
+      static_cast<Lock*>(*lock)->Release();
+      return 0;
+
+    case AV_LOCK_DESTROY:
+      delete static_cast<Lock*>(*lock);
+      *lock = NULL;
+      return 0;
+  }
+  return 1;
+}
+
 }  // namespace
 
 //------------------------------------------------------------------------------
 
 namespace media {
 
 // Use the HTTP protocol to avoid any file path separator issues.
 static const char kProtocol[] = "http";
 
 // Fill out our FFmpeg protocol definition.
 static URLProtocol kFFmpegURLProtocol = {
   kProtocol,
   &OpenContext,
   &ReadContext,
   &WriteContext,
   &SeekContext,
   &CloseContext,
 };
 
 FFmpegGlue::FFmpegGlue() {
   // Before doing anything disable logging as it interferes with layout tests.
   av_log_set_level(AV_LOG_QUIET);
 
   // Register our protocol glue code with FFmpeg.
   avcodec_init();
   av_register_protocol(&kFFmpegURLProtocol);
+  av_lockmgr_register(&LockManagerOperation);
 
   // Now register the rest of FFmpeg.
   av_register_all();
 }
 
 FFmpegGlue::~FFmpegGlue() {
+  av_lockmgr_register(NULL);
 }
 
 std::string FFmpegGlue::AddProtocol(FFmpegURLProtocol* protocol) {
   AutoLock auto_lock(lock_);
   std::string key = GetProtocolKey(protocol);
   if (protocols_.find(key) == protocols_.end()) {
     protocols_[key] = protocol;
   }
   return key;
 }
@@ skipping 22 matching lines @@
 }
 
 std::string FFmpegGlue::GetProtocolKey(FFmpegURLProtocol* protocol) {
   // Use the FFmpegURLProtocol's memory address to generate the unique string.
   // This also has the nice property that adding the same FFmpegURLProtocol
   // reference will not generate duplicate entries.
   return StringPrintf("%s://%p", kProtocol, static_cast<void*>(protocol));
 }
 
 }  // namespace media