diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-03-02 22:16:08 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-03-02 22:16:08 +0000 |
| commit | c414377fbfa2be0577381c80dd0171061e242905 (patch) | |
| tree | 8ce66309033e00d31b0d76030984af84c3c4fcf9 | |
| parent | 6772044da2f3574f09b8f39832710daab249e83f (diff) | |
| download | xine-lib-c414377fbfa2be0577381c80dd0171061e242905.tar.gz xine-lib-c414377fbfa2be0577381c80dd0171061e242905.tar.bz2 | |
Fix compilation with older external ffmpeg.
HAVE_FFMPEG_AVUTIL_H wasn't being defined, and there were some incorrect checks.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | src/libffmpeg/ff_dvaudio_decoder.c | 2 | ||||
| -rw-r--r-- | src/libffmpeg/ff_video_decoder.c | 2 | ||||
| -rw-r--r-- | src/libffmpeg/ffmpeg_decoder.h | 2 | ||||
| -rw-r--r-- | src/post/planar/pp.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/configure.ac b/configure.ac index 0ecd5ab75..73976f2c8 100644 --- a/configure.ac +++ b/configure.ac @@ -353,7 +353,7 @@ if test "x$with_external_ffmpeg" = "xyes"; then dnl Check presence of ffmpeg/avutil.h to see if it's old or new dnl style for headers. The new style would be preferred actually... - AC_CHECK_HEADER([ffmpeg/avutil.h]) + AC_CHECK_HEADERS([ffmpeg/avutil.h]) AC_MSG_NOTICE([ ********************************************************************* diff --git a/src/libffmpeg/ff_dvaudio_decoder.c b/src/libffmpeg/ff_dvaudio_decoder.c index a394e6615..5106a402c 100644 --- a/src/libffmpeg/ff_dvaudio_decoder.c +++ b/src/libffmpeg/ff_dvaudio_decoder.c @@ -52,7 +52,7 @@ # undef uint64_t #endif -#ifdef HAVE_FFMPEG_AVCODEC_H +#ifdef HAVE_FFMPEG_AVUTIL_H # include <avcodec.h> #else # include <libavcodec/avcodec.h> diff --git a/src/libffmpeg/ff_video_decoder.c b/src/libffmpeg/ff_video_decoder.c index d1d69416e..3d9c0225a 100644 --- a/src/libffmpeg/ff_video_decoder.c +++ b/src/libffmpeg/ff_video_decoder.c @@ -45,7 +45,7 @@ #include "ffmpeg_decoder.h" #include "ff_mpeg_parser.h" -#ifdef HAVE_FFMPEG_AVCODEC_H +#ifdef HAVE_FFMPEG_AVUTIL_H # include <postprocess.h> #else # include <libpostproc/postprocess.h> diff --git a/src/libffmpeg/ffmpeg_decoder.h b/src/libffmpeg/ffmpeg_decoder.h index adf0908dd..6de9e8772 100644 --- a/src/libffmpeg/ffmpeg_decoder.h +++ b/src/libffmpeg/ffmpeg_decoder.h @@ -25,7 +25,7 @@ #include "config.h" #endif -#ifdef HAVE_FFMPEG_AVCODEC_H +#ifdef HAVE_FFMPEG_AVUTIL_H # include <avcodec.h> #else # include <libavcodec/avcodec.h> diff --git a/src/post/planar/pp.c b/src/post/planar/pp.c index bc7cc1928..e658dadd0 100644 --- a/src/post/planar/pp.c +++ b/src/post/planar/pp.c @@ -25,7 +25,7 @@ #include "xineutils.h" #include <pthread.h> -#ifdef HAVE_FFMPEG_AVCODEC_H +#ifdef HAVE_FFMPEG_AVUTIL_H # include <postprocess.h> #else # include <libpostproc/postprocess.h> |