diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-06-23 22:07:39 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-06-23 22:07:39 +0100 |
| commit | 86ee0f413dad209aa70e11af357f33856340b1f0 (patch) | |
| tree | df2f1db0ae4c365c668bf9004bdc938d1511b24a /src/combined/ffmpeg | |
| parent | db232ce4a4a0ed45822a27a5443a9aa4c9693fb4 (diff) | |
| download | xine-lib-86ee0f413dad209aa70e11af357f33856340b1f0.tar.gz xine-lib-86ee0f413dad209aa70e11af357f33856340b1f0.tar.bz2 | |
Allow for <libavutil/base64.h> etc.
Fixes build failures with some ffmpeg dev packages, e.g. from debian-multimedia.
Diffstat (limited to 'src/combined/ffmpeg')
| -rw-r--r-- | src/combined/ffmpeg/ff_video_decoder.c | 6 | ||||
| -rw-r--r-- | src/combined/ffmpeg/ffmpeg_decoder.h | 6 |
2 files changed, 10 insertions, 2 deletions
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; |