Roll FFmpeg for M37.

media/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.cc

 // Copyright 2013 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/cdm/ppapi/external_clear_key/ffmpeg_cdm_audio_decoder.h"
 
 #include <algorithm>
 
 #include "base/logging.h"
 #include "media/base/audio_bus.h"
@@ skipping 253 matching lines @@
       static_cast<AVSampleFormat>(av_sample_format_));
   DCHECK_NE(cdm_format, cdm::kUnknownAudioFormat);
   decoded_frames->SetFormat(cdm_format);
 
   // Each audio packet may contain several frames, so we must call the decoder
   // until we've exhausted the packet.  Regardless of the packet size we always
   // want to hand it to the decoder at least once, otherwise we would end up
   // skipping end of stream packets since they have a size of zero.
   do {
     // Reset frame to default values.
-    avcodec_get_frame_defaults(av_frame_.get());
+    av_frame_unref(av_frame_.get());

[wolenetz, 2014/05/20 22:37:10]

Unref prior to first decode looks wrong to me.

[DaleCurtis, 2014/05/20 23:00:45]

I agree it looks weird, but that's the API as written by FFmpeg.  I've verified
the method does the right thing.  av_frame_unref() does nothing when no
references are held:

http://git.chromium.org/gitweb/?p=chromium/third_party/ffmpeg.git;a=blob;f=li...

 
     int frame_decoded = 0;
     int result = avcodec_decode_audio4(
         codec_context_.get(), av_frame_.get(), &frame_decoded, &packet);
 
     if (result < 0) {
       DCHECK(!is_end_of_stream)
           << "End of stream buffer produced an error! "
           << "This is quite possibly a bug in the audio decoder not handling "
           << "end of stream AVPackets correctly.";
@@ skipping 135 matching lines @@
   av_frame_.reset();
 }
 
 void FFmpegCdmAudioDecoder::SerializeInt64(int64 value) {
   const size_t previous_size = serialized_audio_frames_.size();
   serialized_audio_frames_.resize(previous_size + sizeof(value));
   memcpy(&serialized_audio_frames_[0] + previous_size, &value, sizeof(value));
 }
 
 }  // namespace media