Revert 271945 "Roll FFmpeg for M37."

trunk/src/media/ffmpeg/ffmpeg_common.h

Index: trunk/src/media/ffmpeg/ffmpeg_common.h
===================================================================
--- trunk/src/media/ffmpeg/ffmpeg_common.h	(revision 271953)
+++ trunk/src/media/ffmpeg/ffmpeg_common.h	(working copy)
@@ -19,14 +19,6 @@
 
 // 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
-#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);
@@ -69,7 +61,7 @@
 
 inline void ScopedPtrAVFreeFrame::operator()(void* x) const {
   AVFrame* frame = static_cast<AVFrame*>(x);
-  av_frame_free(&frame);
+  avcodec_free_frame(&frame);
 }
 
 // Converts an int64 timestamp in |time_base| units to a base::TimeDelta.