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

media/filters/ffmpeg_audio_decoder.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 "media/filters/ffmpeg_audio_decoder.h"
 
 #include "media/base/callback.h"
 #include "media/base/data_buffer.h"
 #include "media/base/limits.h"
 #include "media/ffmpeg/ffmpeg_common.h"
@@ skipping 43 matching lines @@
       bps == 0 ||
       static_cast<size_t>(bps) > Limits::kMaxBPS ||
       codec_context_->sample_rate == 0 ||
       (static_cast<size_t>(codec_context_->sample_rate) >
        Limits::kMaxSampleRate)) {
     return;
   }
 
   // Serialize calls to avcodec_open().
   AVCodec* codec = avcodec_find_decoder(codec_context_->codec_id);
-  {
-    AutoLock auto_lock(FFmpegLock::get()->lock());
-    if (!codec || avcodec_open(codec_context_, codec) < 0) {
-      return;
-    }
+  if (!codec || avcodec_open(codec_context_, codec) < 0) {
+    return;
   }
 
   // When calling avcodec_find_decoder(), |codec_context_| might be altered by
   // the decoder to give more accurate values of the output format of the
   // decoder. So set the media format after a decoder is allocated.
   // TODO(hclam): Reuse the information provided by the demuxer for now, we may
   // need to wait until the first buffer is decoded to know the correct
   // information.
   media_format_.SetAsInteger(MediaFormat::kChannels, codec_context_->channels);
   media_format_.SetAsInteger(MediaFormat::kSampleBits,
@@ skipping 113 matching lines @@
 base::TimeDelta FFmpegAudioDecoder::CalculateDuration(size_t size) {
   int64 denominator = codec_context_->channels *
       av_get_bits_per_sample_format(codec_context_->sample_fmt) / 8 *
       codec_context_->sample_rate;
   double microseconds = size /
       (denominator / static_cast<double>(base::Time::kMicrosecondsPerSecond));
   return base::TimeDelta::FromMicroseconds(static_cast<int64>(microseconds));
 }
 
 }  // namespace