diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-03-01 02:45:44 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-03-01 02:45:44 +0100 |
| commit | fb54f247855376800b65585e5868cd4d2062c0a2 (patch) | |
| tree | 5c15377efa4fa510043d7001a8cbd2f5ded5a4ca /src | |
| parent | 2e5c9c79a47efe0df60aaea17569ea9f32d347a6 (diff) | |
| download | xine-lib-fb54f247855376800b65585e5868cd4d2062c0a2.tar.gz xine-lib-fb54f247855376800b65585e5868cd4d2062c0a2.tar.bz2 | |
Support the new FFmpeg include layout. Now the same include directive should work for both internal and external FFmpeg (with new layout).
Diffstat (limited to 'src')
| -rw-r--r-- | src/libffmpeg/Makefile.am | 2 | ||||
| -rw-r--r-- | src/libffmpeg/ff_dvaudio_decoder.c | 8 | ||||
| -rw-r--r-- | src/libffmpeg/ff_video_decoder.c | 4 | ||||
| -rw-r--r-- | src/libffmpeg/ffmpeg_decoder.h | 4 |
4 files changed, 10 insertions, 8 deletions
diff --git a/src/libffmpeg/Makefile.am b/src/libffmpeg/Makefile.am index 61acdd0d1..96d269278 100644 --- a/src/libffmpeg/Makefile.am +++ b/src/libffmpeg/Makefile.am @@ -1,5 +1,7 @@ include $(top_srcdir)/misc/Makefile.common +DEFAULT_INCLUDES = -I. + if HAVE_FFMPEG AM_CFLAGS = $(FFMPEG_CFLAGS) $(FFMPEG_POSTPROC_CFLAGS) link_ffmpeg = $(FFMPEG_LIBS) $(FFMPEG_POSTPROC_LIBS) diff --git a/src/libffmpeg/ff_dvaudio_decoder.c b/src/libffmpeg/ff_dvaudio_decoder.c index 0796b3862..a394e6615 100644 --- a/src/libffmpeg/ff_dvaudio_decoder.c +++ b/src/libffmpeg/ff_dvaudio_decoder.c @@ -52,14 +52,14 @@ # undef uint64_t #endif -#ifdef HAVE_FFMPEG +#ifdef HAVE_FFMPEG_AVCODEC_H # include <avcodec.h> -# include "libavcodec/dvdata.h" #else -# include "libavcodec/avcodec.h" -# include "libavcodec/dvdata.h" +# include <libavcodec/avcodec.h> #endif +#include "libavcodec/dvdata.h" + #ifdef _MSC_VER # undef malloc # undef free diff --git a/src/libffmpeg/ff_video_decoder.c b/src/libffmpeg/ff_video_decoder.c index dc07abb9f..d1d69416e 100644 --- a/src/libffmpeg/ff_video_decoder.c +++ b/src/libffmpeg/ff_video_decoder.c @@ -45,10 +45,10 @@ #include "ffmpeg_decoder.h" #include "ff_mpeg_parser.h" -#ifdef HAVE_FFMPEG +#ifdef HAVE_FFMPEG_AVCODEC_H # include <postprocess.h> #else -# include "libavcodec/libpostproc/postprocess.h" +# include <libpostproc/postprocess.h> #endif #define VIDEOBUFSIZE (128*1024) diff --git a/src/libffmpeg/ffmpeg_decoder.h b/src/libffmpeg/ffmpeg_decoder.h index 14788cf29..adf0908dd 100644 --- a/src/libffmpeg/ffmpeg_decoder.h +++ b/src/libffmpeg/ffmpeg_decoder.h @@ -25,10 +25,10 @@ #include "config.h" #endif -#ifdef HAVE_FFMPEG +#ifdef HAVE_FFMPEG_AVCODEC_H # include <avcodec.h> #else -# include "libavcodec/avcodec.h" +# include <libavcodec/avcodec.h> #endif typedef struct ff_codec_s { |