Roll FFmpeg for M37.

media/ffmpeg/ffmpeg_common.h

 // Copyright (c) 2012 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.
 
 #ifndef MEDIA_FFMPEG_FFMPEG_COMMON_H_
 #define MEDIA_FFMPEG_FFMPEG_COMMON_H_
 
 // Used for FFmpeg error codes.
 #include <cerrno>
 
 #include "base/compiler_specific.h"
 #include "base/time/time.h"
 #include "media/base/audio_decoder_config.h"
 #include "media/base/channel_layout.h"
 #include "media/base/media_export.h"
 #include "media/base/video_decoder_config.h"
 #include "media/base/video_frame.h"
 #include "media/ffmpeg/ffmpeg_deleters.h"
 
 // Include FFmpeg header files.
 extern "C" {
+// Disable deprecated features which result in spammy compile warnings.  This
+// list of defines must mirror those in the 'defines' section of the ffmpeg.gyp
+// file or the headers below will generate different structures.
+#define FF_API_PIX_FMT_DESC 0

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

I would prefer these be exported by ffmpeg.gyp and used in media.gyp when
building target(s) containing ffmpeg_common.cc, so they don't become out of
sync. wdyt?

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

Hmm, I don't really like using direct_dependent_settings since it's not easily
discoverable.  Additionally that would apply these defines to all media source
files instead of just the ffmpeg headers.

+#define FF_API_OLD_DECODE_AUDIO 0
+#define FF_API_DESTRUCT_PACKET 0
+#define FF_API_GET_BUFFER 0
+
 // Temporarily disable possible loss of data warning.
 // TODO(scherkus): fix and upstream the compiler warnings.
 MSVC_PUSH_DISABLE_WARNING(4244);
 #include <libavcodec/avcodec.h>
 #include <libavformat/avformat.h>
 #include <libavformat/avio.h>
 #include <libavutil/audioconvert.h>
 #include <libavutil/avutil.h>
 #include <libavutil/mathematics.h>
 #include <libavutil/log.h>
@@ skipping 22 matching lines @@
 
 inline void ScopedPtrAVFreeContext::operator()(void* x) const {
   AVCodecContext* codec_context = static_cast<AVCodecContext*>(x);
   av_free(codec_context->extradata);
   avcodec_close(codec_context);
   av_free(codec_context);
 }
 
 inline void ScopedPtrAVFreeFrame::operator()(void* x) const {
   AVFrame* frame = static_cast<AVFrame*>(x);
-  avcodec_free_frame(&frame);
+  av_frame_free(&frame);
 }
 
 // Converts an int64 timestamp in |time_base| units to a base::TimeDelta.
 // For example if |timestamp| equals 11025 and |time_base| equals {1, 44100}
 // then the return value will be a base::TimeDelta for 0.25 seconds since that
 // is how much time 11025/44100ths of a second represents.
 MEDIA_EXPORT base::TimeDelta ConvertFromTimeBase(const AVRational& time_base,
                                                  int64 timestamp);
 
 // Converts a base::TimeDelta into an int64 timestamp in |time_base| units.
@@ skipping 43 matching lines @@
 PixelFormat VideoFormatToPixelFormat(VideoFrame::Format video_format);
 
 // Convert FFmpeg UTC representation (YYYY-MM-DD HH:MM:SS) to base::Time.
 // Returns true and sets |*out| if |date_utc| contains a valid
 // date string. Otherwise returns fals and timeline_offset is unmodified.
 MEDIA_EXPORT bool FFmpegUTCDateToTime(const char* date_utc, base::Time* out);
 
 }  // namespace media
 
 #endif  // MEDIA_FFMPEG_FFMPEG_COMMON_H_