From: Darren S. <li...@yo...> - 2008-03-02 22:29:09
|
# HG changeset patch # User Darren Salt <li...@yo...> # Date 1204496168 0 # Node ID 7c5f9ac37fae8faa6e2ebfdfe35ff2bc3b2a5c39 # Parent d31b55ade939f130db2742a281c54b6cfef35f34 Fix compilation with older external ffmpeg. HAVE_FFMPEG_AVUTIL_H wasn't being defined, and there were some incorrect checks. diff -r 7c5f9ac37fae8faa6e2ebfdfe35ff2bc3b2a5c39 -r d31b55ade939f130db2742a281c54b6cfef35f34 configure.ac --- a/configure.ac Sun Mar 02 22:16:08 2008 +0000 +++ b/configure.ac Sun Mar 02 18:52:09 2008 +0100 @@ -353,7 +353,7 @@ if test "x$with_external_ffmpeg" = "xyes 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 -r 7c5f9ac37fae8faa6e2ebfdfe35ff2bc3b2a5c39 -r d31b55ade939f130db2742a281c54b6cfef35f34 src/libffmpeg/ff_dvaudio_decoder.c --- a/src/libffmpeg/ff_dvaudio_decoder.c Sun Mar 02 22:16:08 2008 +0000 +++ b/src/libffmpeg/ff_dvaudio_decoder.c Sun Mar 02 18:52:09 2008 +0100 @@ -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 -r 7c5f9ac37fae8faa6e2ebfdfe35ff2bc3b2a5c39 -r d31b55ade939f130db2742a281c54b6cfef35f34 src/libffmpeg/ff_video_decoder.c --- a/src/libffmpeg/ff_video_decoder.c Sun Mar 02 22:16:08 2008 +0000 +++ b/src/libffmpeg/ff_video_decoder.c Sun Mar 02 18:52:09 2008 +0100 @@ -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 -r 7c5f9ac37fae8faa6e2ebfdfe35ff2bc3b2a5c39 -r d31b55ade939f130db2742a281c54b6cfef35f34 src/libffmpeg/ffmpeg_decoder.h --- a/src/libffmpeg/ffmpeg_decoder.h Sun Mar 02 22:16:08 2008 +0000 +++ b/src/libffmpeg/ffmpeg_decoder.h Sun Mar 02 18:52:09 2008 +0100 @@ -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 -r 7c5f9ac37fae8faa6e2ebfdfe35ff2bc3b2a5c39 -r d31b55ade939f130db2742a281c54b6cfef35f34 src/post/planar/pp.c --- a/src/post/planar/pp.c Sun Mar 02 22:16:08 2008 +0000 +++ b/src/post/planar/pp.c Sun Mar 02 18:52:09 2008 +0100 @@ -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> |