diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-03-04 15:59:22 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-03-04 15:59:22 +0000 |
| commit | a574ab02526c78074f643971beebf2b86a3d16e6 (patch) | |
| tree | 787511022fd895d3a96121291edc982e1bfe6911 | |
| parent | a1508e2f58d2c4b32d032d798f6f137262717e7f (diff) | |
| download | xine-lib-a574ab02526c78074f643971beebf2b86a3d16e6.tar.gz xine-lib-a574ab02526c78074f643971beebf2b86a3d16e6.tar.bz2 | |
Fix libavcodec/dvdata.h-related build problems with older ffmpeg.
| -rw-r--r-- | src/combined/ffmpeg/Makefile.am | 2 | ||||
| -rw-r--r-- | src/combined/ffmpeg/ff_dvaudio_decoder.c | 4 |
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 |