summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/combined/ffmpeg/Makefile.am2
-rw-r--r--src/combined/ffmpeg/ff_dvaudio_decoder.c4
2 files changed, 5 insertions, 1 deletions
diff --git a/src/combined/ffmpeg/Makefile.am b/src/combined/ffmpeg/Makefile.am
index b9f0eac5c..3f8f6fa26 100644
--- a/src/combined/ffmpeg/Makefile.am
+++ b/src/combined/ffmpeg/Makefile.am
@@ -5,7 +5,7 @@ AM_CPPFLAGS = $(ZLIB_CPPFLAGS)
AM_LDFLAGS = $(xineplug_ldflags)
if WITH_EXTERNAL_FFMPEG
-AM_CFLAGS += $(FFMPEG_CFLAGS) $(FFMPEG_POSTPROC_CFLAGS)
+AM_CPPFLAGS += $(FFMPEG_CFLAGS) $(FFMPEG_POSTPROC_CFLAGS)
link_ffmpeg = $(FFMPEG_LIBS) $(FFMPEG_POSTPROC_LIBS)
else
AM_CPPFLAGS += -I$(top_srcdir)/contrib/ffmpeg
diff --git a/src/combined/ffmpeg/ff_dvaudio_decoder.c b/src/combined/ffmpeg/ff_dvaudio_decoder.c
index be7e8025f..7e285c115 100644
--- a/src/combined/ffmpeg/ff_dvaudio_decoder.c
+++ b/src/combined/ffmpeg/ff_dvaudio_decoder.c
@@ -54,6 +54,10 @@
#ifdef HAVE_FFMPEG_AVCODEC_H
# include <avcodec.h>
+# include <rational.h>
+# define FFMPEG_AVCODEC_H
+# define FFMPEG_RATIONAL_H
+# define av_unused
#else
# include <libavcodec/avcodec.h>
#endif