diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-03-04 16:00:23 +0000 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-03-04 16:00:23 +0000 |
| commit | b25c91e086a5bef47dfae5838b1e149084dfca47 (patch) | |
| tree | ad6d55e3fedac978a0de17d2ea5432184dc233d2 /src/combined | |
| parent | a574ab02526c78074f643971beebf2b86a3d16e6 (diff) | |
| parent | c414377fbfa2be0577381c80dd0171061e242905 (diff) | |
| download | xine-lib-b25c91e086a5bef47dfae5838b1e149084dfca47.tar.gz xine-lib-b25c91e086a5bef47dfae5838b1e149084dfca47.tar.bz2 | |
Merge from 1.1.
--HG--
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')
| -rw-r--r-- | src/combined/ffmpeg/ff_dvaudio_decoder.c | 2 | ||||
| -rw-r--r-- | src/combined/ffmpeg/ff_video_decoder.c | 2 | ||||
| -rw-r--r-- | src/combined/ffmpeg/ffmpeg_decoder.h | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/src/combined/ffmpeg/ff_dvaudio_decoder.c b/src/combined/ffmpeg/ff_dvaudio_decoder.c index 7e285c115..ef70d117b 100644 --- a/src/combined/ffmpeg/ff_dvaudio_decoder.c +++ b/src/combined/ffmpeg/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> # include <rational.h> # define FFMPEG_AVCODEC_H diff --git a/src/combined/ffmpeg/ff_video_decoder.c b/src/combined/ffmpeg/ff_video_decoder.c index 845ef5d79..58305aa13 100644 --- a/src/combined/ffmpeg/ff_video_decoder.c +++ b/src/combined/ffmpeg/ff_video_decoder.c @@ -47,7 +47,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/combined/ffmpeg/ffmpeg_decoder.h b/src/combined/ffmpeg/ffmpeg_decoder.h index adf0908dd..6de9e8772 100644 --- a/src/combined/ffmpeg/ffmpeg_decoder.h +++ b/src/combined/ffmpeg/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> |