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/dxr3 | |
| 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/dxr3')
| -rw-r--r-- | src/dxr3/dxr3_mpeg_encoders.c | 6 | ||||
| -rw-r--r-- | src/dxr3/video_out_dxr3.c | 6 |
2 files changed, 10 insertions, 2 deletions
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 |