From 19357940a57c565ebe319729bd08d6e4800aff5d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Diego=20=27Flameeyes=27=20Petten=C3=B2?=
 <flameeyes@gmail.com>
Date: Sat, 1 Mar 2008 04:00:18 +0100
Subject: Update to the new FFmpeg's include directory. This also allows to
 remove the comment stating the includes come from libavutil, as it's now
 explicit.

---
 src/input/input_cdda.c      | 6 ++----
 src/input/input_dvb.c       | 3 +--
 src/input/input_http.c      | 2 +-
 src/input/libreal/sdpplin.c | 3 +--
 4 files changed, 5 insertions(+), 9 deletions(-)

(limited to 'src/input')

diff --git a/src/input/input_cdda.c b/src/input/input_cdda.c
index 4f7e7cc3a..bf958b839 100644
--- a/src/input/input_cdda.c
+++ b/src/input/input_cdda.c
@@ -58,9 +58,8 @@
 
 #include <basedir.h>
 
-/* libavutil from FFmpeg */
-#include <base64.h>
-#include <sha1.h>
+#include <libavutil/base64.h>
+#include <libavutil/sha1.h>
 
 #define LOG_MODULE "input_cdda"
 #define LOG_VERBOSE
@@ -72,7 +71,6 @@
 #include <xine/xineutils.h>
 #include <xine/input_plugin.h>
 #include "media_helper.h"
-#include "base64.h"
 
 #if defined(__sun)
 #define	DEFAULT_CDDA_DEVICE	"/vol/dev/aliases/cdrom0"
diff --git a/src/input/input_dvb.c b/src/input/input_dvb.c
index 1b86fcac5..677085c65 100644
--- a/src/input/input_dvb.c
+++ b/src/input/input_dvb.c
@@ -100,8 +100,7 @@
 #endif
 #include <ctype.h>
 
-/* libavutil from FFmpeg */
-#include <crc.h>
+#include <libavutil/crc.h>
 
 /* XDG */
 #include <basedir.h>
diff --git a/src/input/input_http.c b/src/input/input_http.c
index dd9798bb1..a9bca910b 100644
--- a/src/input/input_http.c
+++ b/src/input/input_http.c
@@ -40,7 +40,7 @@
 
 #include <sys/time.h>
 
-#include <base64.h>
+#include <libavutil/base64.h>
 
 #define LOG_MODULE "input_http"
 #define LOG_VERBOSE
diff --git a/src/input/libreal/sdpplin.c b/src/input/libreal/sdpplin.c
index 0dc8709d8..fbc64957b 100644
--- a/src/input/libreal/sdpplin.c
+++ b/src/input/libreal/sdpplin.c
@@ -31,8 +31,7 @@
 #include "sdpplin.h"
 #include <xine/xineutils.h>
 
-/* libavutil from FFmpeg */
-#include <base64.h>
+#include <libavutil/base64.h>
 
 static char *nl(char *data) {
 
-- 
cgit v1.2.3