4 files changed, 10 insertions, 1 deletions
diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c
index a9c935ce0..32497247f 100644
--- a/src/combined/ffmpeg/ff_video_decoder.c
+++ b/src/combined/ffmpeg/ff_video_decoder.c
@@ -44,10 +44,13 @@
 #include "ffmpeg_decoder.h"
 #include "ff_mpeg_parser.h"
 
+#define FF_API_CODEC_ID 1
+
 #ifdef HAVE_FFMPEG_AVUTIL_H
 #  include <postprocess.h>
 #else
 #  include <libpostproc/postprocess.h>
+#  include <libavutil/mem.h>
 #endif
 
 #ifdef HAVE_VA_VA_X11_H
diff --git a/src/combined/ffmpeg/ffmpeg_compat.h b/src/combined/ffmpeg/ffmpeg_compat.h
index b567dc177..8b5a48ee1 100644
--- a/src/combined/ffmpeg/ffmpeg_compat.h
+++ b/src/combined/ffmpeg/ffmpeg_compat.h
@@ -103,7 +103,7 @@
 #endif
 
 /* AVFrame.age */
-#if !(LIBAVCODEC_VERSION_MAJOR >= 53 && LIBAVCODEC_VERSION_MAJOR >= 28 && LIBAVCODEC_VERSION_MICRO >= 1)
+#if LIBAVCODEC_VERSION_INT >= 0x351C01 && LIBAVCODEC_VERSION_INT < 0x360000 // not sure about this - original condition was broken
 #  define AVFRAMEAGE 1
 #endif
 
diff --git a/src/combined/ffmpeg/ffmpeg_decoder.h b/src/combined/ffmpeg/ffmpeg_decoder.h
index 4d9943384..ffa7de8df 100644
--- a/src/combined/ffmpeg/ffmpeg_decoder.h
+++ b/src/combined/ffmpeg/ffmpeg_decoder.h
@@ -25,10 +25,13 @@
 #include "config.h"
 #endif
 
+#define FF_API_CODEC_ID 1
+
 #ifdef HAVE_FFMPEG_AVUTIL_H
 #  include <avcodec.h>
 #else
 #  include <libavcodec/avcodec.h>
+#  include <libavutil/mem.h>
 #endif
 
 typedef struct ff_codec_s {
diff --git a/src/dxr3/ffmpeg_encoder.c b/src/dxr3/ffmpeg_encoder.c
index 4b444a3bc..bf0cda821 100644
--- a/src/dxr3/ffmpeg_encoder.c
+++ b/src/dxr3/ffmpeg_encoder.c
@@ -24,6 +24,8 @@
 #include "config.h"
 #endif
 
+#define FF_API_CODEC_ID 1
+
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
@@ -42,6 +44,7 @@
 #  include <avcodec.h>
 #else
 #  include <libavcodec/avcodec.h>
+#  include <libavutil/mem.h>
 #endif
 
 #include "../combined/ffmpeg/ffmpeg_compat.h"