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/xine-engine | |
| 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/xine-engine')
| -rw-r--r-- | src/xine-engine/buffer.c | 6 | ||||
| -rw-r--r-- | src/xine-engine/configfile.c | 6 |
2 files changed, 10 insertions, 2 deletions
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 |