From bb8ceb0741cbd9c4641c230867e458e7f70e9f37 Mon Sep 17 00:00:00 2001
From: Torsten Jager <t.jager@gmx.de>
Date: Sat, 4 Jan 2014 15:44:30 +0100
Subject: ffmpeg: auto use (AV_)CODEC_ID/(AV_)PIX_FMT part 2. HG #12298 +
 #12335 obsolete the decoder side #define's. Tweaking libavcodec.h after
 building that lib may be risky or future useless anyway.

---
 src/xine-engine/accel_vaapi.h | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'src/xine-engine')

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
 
-- 
cgit v1.2.3