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/input/input_cdda.c      | 9 +++++++--
 src/input/input_dvb.c       | 6 +++++-
 src/input/input_http.c      | 6 +++++-
 src/input/libreal/sdpplin.c | 6 +++++-
 4 files changed, 22 insertions(+), 5 deletions(-)

(limited to 'src/input')

diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index 9cf0d934d..df3a58aea 100644
--- a/src/input/input_cdda.c
+++ b/src/input/input_cdda.c
@@ -58,8 +58,13 @@
 
 #include <basedir.h>
 
-#include <base64.h>
-#include <sha1.h>
+#ifdef HAVE_FFMPEG_AVUTIL_H
+#  include <base64.h>
+#  include <sha1.h>
+#else
+#  include <libavutil/base64.h>
+#  include <libavutil/sha1.h>
+#endif
 
 #define LOG_MODULE "input_cdda"
 #define LOG_VERBOSE
diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c
index d3a7a918d..bf62a0ff0 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -100,7 +100,11 @@
 #endif
 #include <ctype.h>
 
-#include <crc.h>
+#ifdef HAVE_FFMPEG_AVUTIL_H
+#  include <crc.h>
+#else
+#  include <libavutil/crc.h>
+#endif
 
 /* XDG */
 #include <basedir.h>
diff --git a/src/input/input_http.c b/src/input/input_http.c
index 242bea8d0..83d4bdff1 100644
--- a/src/input/input_http.c
+++ b/src/input/input_http.c
@@ -40,7 +40,11 @@
 
 #include <sys/time.h>
 
-#include <base64.h>
+#ifdef HAVE_FFMPEG_AVUTIL_H
+#  include <base64.h>
+#else
+#  include <libavutil/base64.h>
+#endif
 
 #define LOG_MODULE "input_http"
 #define LOG_VERBOSE
diff --git a/src/input/libreal/sdpplin.c b/src/input/libreal/sdpplin.c
index d4be0959b..9db1e383a 100644
--- a/src/input/libreal/sdpplin.c
+++ b/src/input/libreal/sdpplin.c
@@ -31,7 +31,11 @@
 #include "sdpplin.h"
 #include <xine/xineutils.h>
 
-#include <base64.h>
+#ifdef HAVE_FFMPEG_AVUTIL_H
+#  include <base64.h>
+#else
+#  include <libavutil/base64.h>
+#endif
 
 static char *nl(char *data) {
 
-- 
cgit v1.2.3