5 files changed, 17 insertions, 13 deletions
diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c
index 367fe4483..1383c7f67 100644
--- a/src/combined/ffmpeg/ff_video_decoder.c
+++ b/src/combined/ffmpeg/ff_video_decoder.c
@@ -44,8 +44,6 @@
 #include "ffmpeg_decoder.h"
 #include "ff_mpeg_parser.h"
 
-#define FF_API_CODEC_ID 1
-
 #ifdef HAVE_FFMPEG_AVUTIL_H
 #  include <postprocess.h>
 #else
diff --git a/src/combined/ffmpeg/ffmpeg_compat.h b/src/combined/ffmpeg/ffmpeg_compat.h
index fc338cb75..f28f88fc8 100644
--- a/src/combined/ffmpeg/ffmpeg_compat.h
+++ b/src/combined/ffmpeg/ffmpeg_compat.h
@@ -143,6 +143,22 @@
 #  define PIX_FMT_RGB565LE  AV_PIX_FMT_RGB565LE
 #  define PIX_FMT_PAL8      AV_PIX_FMT_PAL8
 #  define PixelFormat       AVPixelFormat
+/* video_out/video_out_vaapi */
+#  define PIX_FMT_VAAPI_IDCT AV_PIX_FMT_VAAPI_IDCT
+#  define PIX_FMT_VAAPI_MOCO AV_PIX_FMT_VAAPI_MOCO
+#endif
+
+#if defined LIBAVCODEC_VERSION_INT && LIBAVCODEC_VERSION_INT >= ((54<<16)|(25<<8))
+/* dxr3/ffmpeg_encoder */
+#  define CODEC_ID_MPEG1VIDEO AV_CODEC_ID_MPEG1VIDEO
+/* video_out/video_out_vaapi */
+#  define CODEC_ID_MPEG2VIDEO AV_CODEC_ID_MPEG2VIDEO
+#  define CODEC_ID_MPEG4      AV_CODEC_ID_MPEG4
+#  define CODEC_ID_H263       AV_CODEC_ID_H263
+#  define CODEC_ID_H264       AV_CODEC_ID_H264
+#  define CODEC_ID_WMV3       AV_CODEC_ID_WMV3
+#  define CODEC_ID_VC1        AV_CODEC_ID_VC1
+/* ff_*_decoder is already handled by mkcodeclists.pl */
 #endif
 
 #ifndef AVCODEC_MAX_AUDIO_FRAME_SIZE
diff --git a/src/combined/ffmpeg/ffmpeg_decoder.h b/src/combined/ffmpeg/ffmpeg_decoder.h
index 0260497c2..a1e01adaf 100644
--- a/src/combined/ffmpeg/ffmpeg_decoder.h
+++ b/src/combined/ffmpeg/ffmpeg_decoder.h
@@ -25,8 +25,6 @@
 #include "config.h"
 #endif
 
-#define FF_API_CODEC_ID 1
-
 #ifdef HAVE_FFMPEG_AVUTIL_H
 #  include <avcodec.h>
 #else
diff --git a/src/dxr3/ffmpeg_encoder.c b/src/dxr3/ffmpeg_encoder.c
index 5422ce6ee..7d5bb9529 100644
--- a/src/dxr3/ffmpeg_encoder.c
+++ b/src/dxr3/ffmpeg_encoder.c
@@ -24,8 +24,6 @@
 #include "config.h"
 #endif
 
-#define FF_API_CODEC_ID 1
-
 #include <stdio.h>
 #include <stdlib.h>
 #include <sys/ioctl.h>
diff --git a/src/xine-engine/accel_vaapi.h b/src/xine-engine/accel_vaapi.h
index 454bc1d9f..1e3da26ea 100644
--- a/src/xine-engine/accel_vaapi.h
+++ b/src/xine-engine/accel_vaapi.h
@@ -43,13 +43,7 @@ extern "C" {
 #  include <libavcodec/avcodec.h>
 #endif
 
-#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 32)
-#  define AVVIDEO 2
-#else
-#  define AVVIDEO 1
-#  define pp_context	pp_context_t
-#  define pp_mode	pp_mode_t
-#endif
+#include "../combined/ffmpeg/ffmpeg_compat.h"
 
 #define NUM_OUTPUT_SURFACES 22