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/post/planar | |
| 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/post/planar')
| -rw-r--r-- | src/post/planar/pp.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/post/planar/pp.c b/src/post/planar/pp.c index f8c571dcb..6dbd74ac9 100644 --- a/src/post/planar/pp.c +++ b/src/post/planar/pp.c @@ -25,9 +25,14 @@ #include <xine/xine_internal.h> #include <xine/post.h> #include <xine/xineutils.h> -#include "postprocess.h" #include <pthread.h> +#ifdef HAVE_FFMPEG_AVUTIL_H +# include <postprocess.h> +#else +# include <libpostproc/postprocess.h> +#endif + #define PP_STRING_SIZE 256 /* size of pp mode string (including all options) */ /* plugin class initialization function */ |