diff options
| author | Torsten Jager <t.jager@gmx.de> | 2014-01-04 15:44:30 +0100 |
|---|---|---|
| committer | Torsten Jager <t.jager@gmx.de> | 2014-01-04 15:44:30 +0100 |
| commit | bb8ceb0741cbd9c4641c230867e458e7f70e9f37 (patch) | |
| tree | f87b6498a18013e6ac8745b5a22c1eed94be0e2e /src/xine-engine | |
| parent | ad791b5a1447f6bdbf23d337ad654503234b4e34 (diff) | |
| download | xine-lib-bb8ceb0741cbd9c4641c230867e458e7f70e9f37.tar.gz xine-lib-bb8ceb0741cbd9c4641c230867e458e7f70e9f37.tar.bz2 | |
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.
Diffstat (limited to 'src/xine-engine')
| -rw-r--r-- | src/xine-engine/accel_vaapi.h | 8 |
1 files changed, 1 insertions, 7 deletions
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 |