diff options
| -rw-r--r-- | configure.ac | 11 | ||||
| -rw-r--r-- | src/inputPlugins/ffmpeg_plugin.c | 6 |
2 files changed, 17 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 2a2552972..3395b6dcf 100644 --- a/configure.ac +++ b/configure.ac @@ -689,6 +689,17 @@ if test x$enable_ffmpeg = xyes; then enable_ffmpeg=no) fi +if test x$enable_ffmpeg = xyes; then + # prior to ffmpeg svn12865, you had to specify include files + # without path prefix + old_CPPCFLAGS=$CPPFLAGS + CPPFLAGS="$CPPFLAGS $FFMPEG_CFLAGS" + AC_CHECK_HEADER(libavcodec/avcodec.h,, + AC_DEFINE(OLD_FFMPEG_INCLUDES, 1, + [Define if avcodec.h instead of libavcodec/avcodec.h should be included])) + CPPCFLAGS=$old_CPPFLAGS +fi + AM_CONDITIONAL(HAVE_FFMPEG, test x$enable_ffmpeg = xyes) case $with_zeroconf in diff --git a/src/inputPlugins/ffmpeg_plugin.c b/src/inputPlugins/ffmpeg_plugin.c index 7d3c24360..95e15957c 100644 --- a/src/inputPlugins/ffmpeg_plugin.c +++ b/src/inputPlugins/ffmpeg_plugin.c @@ -29,9 +29,15 @@ #include <sys/stat.h> #include <unistd.h> +#ifdef OLD_FFMPEG_INCLUDES #include <avcodec.h> #include <avformat.h> #include <avio.h> +#else +#include <libavcodec/avcodec.h> +#include <libavformat/avformat.h> +#include <libavformat/avio.h> +#endif typedef struct { int audioStream; |