From 86ee0f413dad209aa70e11af357f33856340b1f0 Mon Sep 17 00:00:00 2001
From: Darren Salt <linux@youmustbejoking.demon.co.uk>
Date: Mon, 23 Jun 2008 22:07:39 +0100
Subject: Allow for <libavutil/base64.h> etc. Fixes build failures with some
 ffmpeg dev packages, e.g. from debian-multimedia.

---
 src/post/planar/noise.c | 6 +++++-
 src/post/planar/pp.c    | 6 +++++-
 2 files changed, 10 insertions(+), 2 deletions(-)

(limited to 'src/post/planar')

diff --git a/src/post/planar/noise.c b/src/post/planar/noise.c
index 8bceb2f74..5c353522f 100644
--- a/src/post/planar/noise.c
+++ b/src/post/planar/noise.c
@@ -27,7 +27,11 @@
 #include <math.h>
 #include <pthread.h>
 
-#include <mem.h>
+#ifdef HAVE_FFMPEG_AVUTIL_H
+#  include <mem.h>
+#else
+#  include <libavutil/mem.h>
+#endif
 
 #ifdef ARCH_X86_64
 #  define REG_a  "rax"
diff --git a/src/post/planar/pp.c b/src/post/planar/pp.c
index 25447683a..01dd89c40 100644
--- a/src/post/planar/pp.c
+++ b/src/post/planar/pp.c
@@ -29,7 +29,11 @@
 #include <xine/xine_internal.h>
 #include <xine/post.h>
 #include <xine/xineutils.h>
-#include <postprocess.h>
+#ifdef HAVE_FFMPEG_AVUTIL_H
+#  include <postprocess.h>
+#else
+#  include <libpostproc/postprocess.h>
+#endif
 #include <pthread.h>
 
 #define PP_STRING_SIZE 256 /* size of pp mode string (including all options) */
-- 
cgit v1.2.3