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/audio_dec | |
| 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/audio_dec')
| -rw-r--r-- | src/audio_dec/ff_dvdata.h | 9 | ||||
| -rw-r--r-- | src/audio_dec/xine_a52_decoder.c | 6 |
2 files changed, 12 insertions, 3 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 |