diff options
| author | Petri Hintukainen <phintuka@users.sourceforge.net> | 2012-01-18 13:13:37 +0200 |
|---|---|---|
| committer | Petri Hintukainen <phintuka@users.sourceforge.net> | 2012-01-18 13:13:37 +0200 |
| commit | 0c50f90e9a9172cfd850a0fe6e8d24cd9b378ab2 (patch) | |
| tree | e646762599f2356c86746ffe09cd6be11abbf58f /src/combined/ffmpeg/ff_video_decoder.c | |
| parent | 003cfd21d5dd40a89094946f6377b3b686cf6d30 (diff) | |
| download | xine-lib-0c50f90e9a9172cfd850a0fe6e8d24cd9b378ab2.tar.gz xine-lib-0c50f90e9a9172cfd850a0fe6e8d24cd9b378ab2.tar.bz2 | |
Moved ffmpeg API version checks to single header
Diffstat (limited to 'src/combined/ffmpeg/ff_video_decoder.c')
| -rw-r--r-- | src/combined/ffmpeg/ff_video_decoder.c | 20 |
1 files changed, 2 insertions, 18 deletions
diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c index 50357182a..90eeadffe 100644 --- a/src/combined/ffmpeg/ff_video_decoder.c +++ b/src/combined/ffmpeg/ff_video_decoder.c @@ -51,6 +51,8 @@ # include <libpostproc/postprocess.h> #endif +#include "ffmpeg_compat.h" + #define VIDEOBUFSIZE (128*1024) #define SLICE_BUFFER_SIZE (1194*1024) @@ -58,24 +60,6 @@ #define ENABLE_DIRECT_RENDERING -#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 - -#if LIBAVCODEC_VERSION_MAJOR >= 53 || (LIBAVCODEC_VERSION_MAJOR == 52 && LIBAVCODEC_VERSION_MINOR >= 112) -# define DEPRECATED_AVCODEC_THREAD_INIT 1 -#endif - -/* reordered_opaque appeared in libavcodec 51.68.0 */ -#define AVCODEC_HAS_REORDERED_OPAQUE -#if LIBAVCODEC_VERSION_INT < 0x334400 -# undef AVCODEC_HAS_REORDERED_OPAQUE -#endif - typedef struct ff_video_decoder_s ff_video_decoder_t; typedef struct ff_video_class_s { |