Index: media/ffmpeg/ffmpeg_common.h |
diff --git a/media/ffmpeg/ffmpeg_common.h b/media/ffmpeg/ffmpeg_common.h |
index c697bee69f40772db371cd00a05a0d6e935969eb..ef1a7b6a7620cbabdf534be3797ea27842402c19 100644 |
--- a/media/ffmpeg/ffmpeg_common.h |
+++ b/media/ffmpeg/ffmpeg_common.h |
@@ -19,6 +19,14 @@ |
// 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); |
@@ -61,7 +69,7 @@ inline void ScopedPtrAVFreeContext::operator()(void* x) const { |
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. |