summaryrefslogtreecommitdiff
path: root/src/post/planar/pp.c
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2008-06-20 16:38:25 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2008-06-20 16:38:25 +0100
commit3ce0de86ad429962ab581b9af762aa5dc9d3f156 (patch)
tree4640aaa3ece95b03f3ee7ef74e5162005347753a /src/post/planar/pp.c
parent17c9a01cbafd5ff0e6645f96f8ac084fbf239e4d (diff)
parentf3974e74f2f1548bf07604fddfa60cf75b2fda57 (diff)
downloadxine-lib-3ce0de86ad429962ab581b9af762aa5dc9d3f156.tar.gz
xine-lib-3ce0de86ad429962ab581b9af762aa5dc9d3f156.tar.bz2
Merge the avutil branch; port the "raw" video output plugin.
--HG-- rename : src/combined/ffmpeg/ff_dvaudio_decoder.c => src/audio_dec/ff_dvaudio_decoder.c rename : src/combined/ffmpeg/ffmpeg_encoder.c => src/dxr3/ffmpeg_encoder.c
Diffstat (limited to 'src/post/planar/pp.c')
-rw-r--r--src/post/planar/pp.c7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/post/planar/pp.c b/src/post/planar/pp.c
index ce163aacc..25447683a 100644
--- a/src/post/planar/pp.c
+++ b/src/post/planar/pp.c
@@ -29,14 +29,9 @@
#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 */