diff options
Diffstat (limited to 'src')
27 files changed, 139 insertions, 29 deletions
diff --git a/src/audio_dec/ff_dvdata.h b/src/audio_dec/ff_dvdata.h index fc99349d0..f1d7af260 100644 --- a/src/audio_dec/ff_dvdata.h +++ b/src/audio_dec/ff_dvdata.h @@ -27,8 +27,13 @@ #ifndef FFMPEG_DVDATA_H #define FFMPEG_DVDATA_H -#include <avcodec.h> -#include <rational.h> +#ifdef HAVE_FFMPEG_AVUTIL_H +# include <avcodec.h> +# include <rational.h> +#else +# include <libavcodec/avcodec.h> +# include <libavutil/rational.h> +#endif /* * DVprofile is used to express the differences between various diff --git a/src/audio_dec/xine_a52_decoder.c b/src/audio_dec/xine_a52_decoder.c index 053980d17..98d3f1a9a 100644 --- a/src/audio_dec/xine_a52_decoder.c +++ b/src/audio_dec/xine_a52_decoder.c @@ -62,7 +62,11 @@ #include <xine/buffer.h> #include <xine/xineutils.h> -#include <crc.h> +#ifdef HAVE_FFMPEG_AVUTIL_H +# include <crc.h> +#else +# include <libavutil/crc.h> +#endif #undef DEBUG_A52 #ifdef DEBUG_A52 diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c index c80ee5928..02fcdce40 100644 --- a/src/combined/ffmpeg/ff_video_decoder.c +++ b/src/combined/ffmpeg/ff_video_decoder.c @@ -44,7 +44,11 @@ #include "ffmpeg_decoder.h" #include "ff_mpeg_parser.h" -#include <postprocess.h> +#ifdef HAVE_FFMPEG_AVUTIL_H +# include <postprocess.h> +#else +# include <libpostproc/postprocess.h> +#endif #define VIDEOBUFSIZE (128*1024) #define SLICE_BUFFER_SIZE (1194*1024) diff --git a/src/combined/ffmpeg/ffmpeg_decoder.h b/src/combined/ffmpeg/ffmpeg_decoder.h index bfe71a6b1..6de9e8772 100644 --- a/src/combined/ffmpeg/ffmpeg_decoder.h +++ b/src/combined/ffmpeg/ffmpeg_decoder.h @@ -25,7 +25,11 @@ #include "config.h" #endif -#include <avcodec.h> +#ifdef HAVE_FFMPEG_AVUTIL_H +# include <avcodec.h> +#else +# include <libavcodec/avcodec.h> +#endif typedef struct ff_codec_s { uint32_t type; diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c index 8d2ec26a2..f8002ef9c 100644 --- a/src/demuxers/demux_mpeg_block.c +++ b/src/demuxers/demux_mpeg_block.c @@ -31,7 +31,11 @@ #include <unistd.h> #include <string.h> -#include <mem.h> +#ifdef HAVE_FFMPEG_AVUTIL_H +# include <mem.h> +#else +# include <libavutil/mem.h> +#endif #define LOG_MODULE "demux_mpeg_block" #define LOG_VERBOSE diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c index 2687e21e8..83173ce9a 100644 --- a/src/demuxers/demux_mpeg_pes.c +++ b/src/demuxers/demux_mpeg_pes.c @@ -35,7 +35,11 @@ #include <unistd.h> #include <string.h> -#include <mem.h> +#ifdef HAVE_FFMPEG_AVUTIL_H +# include <mem.h> +#else +# include <libavutil/mem.h> +#endif #define LOG_MODULE "demux_mpeg_pes" #define LOG_VERBOSE diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c index 785f404d4..5bc5a4d9e 100644 --- a/src/demuxers/demux_ts.c +++ b/src/demuxers/demux_ts.c @@ -141,7 +141,11 @@ #include <unistd.h> #include <string.h> -#include <crc.h> +#ifdef HAVE_FFMPEG_AVUTIL_H +# include <crc.h> +#else +# include <libavutil/crc.h> +#endif #define LOG_MODULE "demux_ts" #define LOG_VERBOSE diff --git a/src/dxr3/dxr3_mpeg_encoders.c b/src/dxr3/dxr3_mpeg_encoders.c index 9ab4792ac..66f1ef876 100644 --- a/src/dxr3/dxr3_mpeg_encoders.c +++ b/src/dxr3/dxr3_mpeg_encoders.c @@ -44,7 +44,11 @@ #include <math.h> #include <unistd.h> -#include <mem.h> +#ifdef HAVE_FFMPEG_AVUTIL_H +# include <mem.h> +#else +# include <libavutil/mem.h> +#endif #define LOG_MODULE "dxr3_mpeg_encoder" /* #define LOG_VERBOSE */ diff --git a/src/dxr3/video_out_dxr3.c b/src/dxr3/video_out_dxr3.c index 672c2c409..df754c97f 100644 --- a/src/dxr3/video_out_dxr3.c +++ b/src/dxr3/video_out_dxr3.c @@ -66,7 +66,11 @@ #include "dxr3.h" #include "video_out_dxr3.h" -#include <mem.h> +#ifdef HAVE_FFMPEG_AVUTIL_H +# include <mem.h> +#else +# include <libavutil/mem.h> +#endif /* the amount of extra time we give the card for decoding */ #define DECODE_PIPE_PREBUFFER 10000 diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c index 9cf0d934d..df3a58aea 100644 --- a/src/input/input_cdda.c +++ b/src/input/input_cdda.c @@ -58,8 +58,13 @@ #include <basedir.h> -#include <base64.h> -#include <sha1.h> +#ifdef HAVE_FFMPEG_AVUTIL_H +# include <base64.h> +# include <sha1.h> +#else +# include <libavutil/base64.h> +# include <libavutil/sha1.h> +#endif #define LOG_MODULE "input_cdda" #define LOG_VERBOSE diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c index d3a7a918d..bf62a0ff0 100644 --- a/src/input/input_dvb.c +++ b/src/input/input_dvb.c @@ -100,7 +100,11 @@ #endif #include <ctype.h> -#include <crc.h> +#ifdef HAVE_FFMPEG_AVUTIL_H +# include <crc.h> +#else +# include <libavutil/crc.h> +#endif /* XDG */ #include <basedir.h> diff --git a/src/input/input_http.c b/src/input/input_http.c index 242bea8d0..83d4bdff1 100644 --- a/src/input/input_http.c +++ b/src/input/input_http.c @@ -40,7 +40,11 @@ #include <sys/time.h> -#include <base64.h> +#ifdef HAVE_FFMPEG_AVUTIL_H +# include <base64.h> +#else +# include <libavutil/base64.h> +#endif #define LOG_MODULE "input_http" #define LOG_VERBOSE diff --git a/src/input/libreal/sdpplin.c b/src/input/libreal/sdpplin.c index d4be0959b..9db1e383a 100644 --- a/src/input/libreal/sdpplin.c +++ b/src/input/libreal/sdpplin.c @@ -31,7 +31,11 @@ #include "sdpplin.h" #include <xine/xineutils.h> -#include <base64.h> +#ifdef HAVE_FFMPEG_AVUTIL_H +# include <base64.h> +#else +# include <libavutil/base64.h> +#endif static char *nl(char *data) { diff --git a/src/post/planar/noise.c b/src/post/planar/noise.c index 8bceb2f74..5c353522f 100644 --- a/src/post/planar/noise.c +++ b/src/post/planar/noise.c @@ -27,7 +27,11 @@ #include <math.h> #include <pthread.h> -#include <mem.h> +#ifdef HAVE_FFMPEG_AVUTIL_H +# include <mem.h> +#else +# include <libavutil/mem.h> +#endif #ifdef ARCH_X86_64 # define REG_a "rax" diff --git a/src/post/planar/pp.c b/src/post/planar/pp.c index 25447683a..01dd89c40 100644 --- a/src/post/planar/pp.c +++ b/src/post/planar/pp.c @@ -29,7 +29,11 @@ #include <xine/xine_internal.h> #include <xine/post.h> #include <xine/xineutils.h> -#include <postprocess.h> +#ifdef HAVE_FFMPEG_AVUTIL_H +# include <postprocess.h> +#else +# include <libpostproc/postprocess.h> +#endif #include <pthread.h> #define PP_STRING_SIZE 256 /* size of pp mode string (including all options) */ diff --git a/src/video_dec/libmpeg2/decode.c b/src/video_dec/libmpeg2/decode.c index a9db54847..848d111fc 100644 --- a/src/video_dec/libmpeg2/decode.c +++ b/src/video_dec/libmpeg2/decode.c @@ -37,7 +37,11 @@ #define LOG */ -#include <mem.h> +#ifdef HAVE_FFMPEG_AVUTIL_H +# include <mem.h> +#else +# include <libavutil/mem.h> +#endif #include <xine/xine_internal.h> #include <xine/video_out.h> diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c index 7c021a090..2eaf9e239 100644 --- a/src/video_out/video_out_aa.c +++ b/src/video_out/video_out_aa.c @@ -35,7 +35,11 @@ #include <sys/mman.h> #include <sys/time.h> -#include <mem.h> +#ifdef HAVE_FFMPEG_AVUTIL_H +# include <mem.h> +#else +# include <libavutil/mem.h> +#endif #include <aalib.h> diff --git a/src/video_out/video_out_caca.c b/src/video_out/video_out_caca.c index 60552764f..084b43a7a 100644 --- a/src/video_out/video_out_caca.c +++ b/src/video_out/video_out_caca.c @@ -37,7 +37,11 @@ #include <cucul.h> #include <caca.h> -#include <mem.h> +#ifdef HAVE_FFMPEG_AVUTIL_H +# include <mem.h> +#else +# include <libavutil/mem.h> +#endif #include "xine.h" #include <xine/video_out.h> diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c index 107d2a133..f37b345ce 100644 --- a/src/video_out/video_out_fb.c +++ b/src/video_out/video_out_fb.c @@ -68,7 +68,11 @@ #include <pthread.h> #include <netinet/in.h> -#include <mem.h> +#ifdef HAVE_FFMPEG_AVUTIL_H +# include <mem.h> +#else +# include <libavutil/mem.h> +#endif #include <linux/fb.h> #include <linux/kd.h> diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c index 9656f9551..4aeaab325 100644 --- a/src/video_out/video_out_opengl.c +++ b/src/video_out/video_out_opengl.c @@ -47,7 +47,11 @@ #include <ctype.h> #include <pthread.h> -#include <mem.h> +#ifdef HAVE_FFMPEG_AVUTIL_H +# include <mem.h> +#else +# include <libavutil/mem.h> +#endif /* defines for debugging extensions only */ /* #define GL_GLEXT_LEGACY */ diff --git a/src/video_out/video_out_raw.c b/src/video_out/video_out_raw.c index 227331f2f..e6961c4a7 100644 --- a/src/video_out/video_out_raw.c +++ b/src/video_out/video_out_raw.c @@ -54,7 +54,11 @@ #include "yuv2rgb.h" #include <xine/xineutils.h> -#include <mem.h> +#ifdef HAVE_FFMPEG_AVUTIL_H +# include <mem.h> +#else +# include <libavutil/mem.h> +#endif typedef struct { vo_frame_t vo_frame; diff --git a/src/video_out/video_out_xcbshm.c b/src/video_out/video_out_xcbshm.c index 509412eb6..9adafa44b 100644 --- a/src/video_out/video_out_xcbshm.c +++ b/src/video_out/video_out_xcbshm.c @@ -50,7 +50,11 @@ #include <pthread.h> #include <netinet/in.h> -#include <mem.h> +#ifdef HAVE_FFMPEG_AVUTIL_H +# include <mem.h> +#else +# include <libavutil/mem.h> +#endif #define LOG_MODULE "video_out_xcbshm" #define LOG_VERBOSE diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c index 54cac9d46..efb4a55d2 100644 --- a/src/video_out/video_out_xshm.c +++ b/src/video_out/video_out_xshm.c @@ -51,7 +51,11 @@ #include <pthread.h> #include <netinet/in.h> -#include <mem.h> +#ifdef HAVE_FFMPEG_AVUTIL_H +# include <mem.h> +#else +# include <libavutil/mem.h> +#endif #define LOG_MODULE "video_out_xshm" #define LOG_VERBOSE diff --git a/src/video_out/yuv2rgb.c b/src/video_out/yuv2rgb.c index 7def639a4..694a966f8 100644 --- a/src/video_out/yuv2rgb.c +++ b/src/video_out/yuv2rgb.c @@ -31,7 +31,11 @@ #include <string.h> #include <inttypes.h> -#include <mem.h> +#ifdef HAVE_FFMPEG_AVUTIL_H +# include <mem.h> +#else +# include <libavutil/mem.h> +#endif #include "yuv2rgb.h" diff --git a/src/video_out/yuv2rgb_mmx.c b/src/video_out/yuv2rgb_mmx.c index 52a683d30..08b288f22 100644 --- a/src/video_out/yuv2rgb_mmx.c +++ b/src/video_out/yuv2rgb_mmx.c @@ -31,7 +31,11 @@ #include <string.h> #include <inttypes.h> -#include <mem.h> +#ifdef HAVE_FFMPEG_AVUTIL_H +# include <mem.h> +#else +# include <libavutil/mem.h> +#endif #include "yuv2rgb.h" #include <xine/xineutils.h> diff --git a/src/xine-engine/buffer.c b/src/xine-engine/buffer.c index 563999bbf..bf2ea41e9 100644 --- a/src/xine-engine/buffer.c +++ b/src/xine-engine/buffer.c @@ -36,7 +36,11 @@ #include <stdlib.h> #include <assert.h> -#include <mem.h> +#ifdef HAVE_FFMPEG_AVUTIL_H +# include <mem.h> +#else +# include <libavutil/mem.h> +#endif /********** logging **********/ #define LOG_MODULE "buffer" diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c index 91113cdfc..f18cf6661 100644 --- a/src/xine-engine/configfile.c +++ b/src/xine-engine/configfile.c @@ -33,7 +33,11 @@ #include <unistd.h> #include <xine/configfile.h> #include "bswap.h" -#include <base64.h> +#ifdef HAVE_FFMPEG_AVUTIL_H +# include <base64.h> +#else +# include <libavutil/base64.h> +#endif #define LOG_MODULE "configfile" #define LOG_VERBOSE |