diff options
| author | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-03-01 02:52:41 +0100 |
|---|---|---|
| committer | Diego 'Flameeyes' Pettenò <flameeyes@gmail.com> | 2008-03-01 02:52:41 +0100 |
| commit | ced1af6e9fc07b305c00ec76fd584c3654421ea7 (patch) | |
| tree | 7dd9043b379294baa8b19bef70456aa02a750643 /src/combined/ffmpeg/ff_dvaudio_decoder.c | |
| parent | fc9ff87cf9b7753a1622339b4dd3e4ea286f05e7 (diff) | |
| parent | fb54f247855376800b65585e5868cd4d2062c0a2 (diff) | |
| download | xine-lib-ced1af6e9fc07b305c00ec76fd584c3654421ea7.tar.gz xine-lib-ced1af6e9fc07b305c00ec76fd584c3654421ea7.tar.bz2 | |
Merge from 1.1.
--HG--
rename : src/libffmpeg/Makefile.am => src/combined/ffmpeg/Makefile.am
rename : src/libffmpeg/ff_dvaudio_decoder.c => src/combined/ffmpeg/ff_dvaudio_decoder.c
rename : src/libffmpeg/ff_video_decoder.c => src/combined/ffmpeg/ff_video_decoder.c
rename : src/libffmpeg/ffmpeg_decoder.h => src/combined/ffmpeg/ffmpeg_decoder.h
Diffstat (limited to 'src/combined/ffmpeg/ff_dvaudio_decoder.c')
| -rw-r--r-- | src/combined/ffmpeg/ff_dvaudio_decoder.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/combined/ffmpeg/ff_dvaudio_decoder.c b/src/combined/ffmpeg/ff_dvaudio_decoder.c index aced7f5bb..293f35e7c 100644 --- a/src/combined/ffmpeg/ff_dvaudio_decoder.c +++ b/src/combined/ffmpeg/ff_dvaudio_decoder.c @@ -52,7 +52,12 @@ # undef uint64_t #endif -#include <avcodec.h> +#ifdef HAVE_FFMPEG_AVCODEC_H +# include <avcodec.h> +#else +# include <libavcodec/avcodec.h> +#endif + #include <dvdata.h> /* This is not installed by FFmpeg, its usage has to be cleared up */ #ifdef _MSC_VER |