summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--configure.ac2
-rw-r--r--src/libffmpeg/ff_dvaudio_decoder.c2
-rw-r--r--src/libffmpeg/ff_video_decoder.c2
-rw-r--r--src/libffmpeg/ffmpeg_decoder.h2
-rw-r--r--src/post/planar/pp.c2
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>