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/audio_dec/ff_dvdata.h        | 4 ++--
 src/audio_dec/xine_a52_decoder.c | 3 +--
 src/demuxers/demux_mpeg_block.c  | 3 +--
 src/demuxers/demux_mpeg_pes.c    | 3 +--
 src/demuxers/demux_ts.c          | 3 +--
 src/dxr3/dxr3_mpeg_encoders.c    | 3 +--
 src/input/input_cdda.c           | 6 ++----
 src/input/input_dvb.c            | 3 +--
 src/input/input_http.c           | 2 +-
 src/input/libreal/sdpplin.c      | 3 +--
 src/post/planar/noise.c          | 3 +--
 src/post/planar/pp.c             | 2 +-
 src/video_dec/libmpeg2/decode.c  | 3 +--
 src/video_out/video_out_aa.c     | 3 +--
 src/video_out/video_out_caca.c   | 3 +--
 src/video_out/video_out_fb.c     | 3 +--
 src/video_out/video_out_opengl.c | 3 +--
 src/video_out/video_out_xcbshm.c | 3 +--
 src/video_out/video_out_xshm.c   | 3 +--
 src/video_out/yuv2rgb.c          | 3 +--
 src/video_out/yuv2rgb_mmx.c      | 3 +--
 src/xine-engine/buffer.c         | 3 +--
 22 files changed, 24 insertions(+), 44 deletions(-)

(limited to 'src')

diff --git a/src/audio_dec/ff_dvdata.h b/src/audio_dec/ff_dvdata.h
index fc99349d0..5e6d3d485 100644
--- a/src/audio_dec/ff_dvdata.h
+++ b/src/audio_dec/ff_dvdata.h
@@ -27,8 +27,8 @@
 #ifndef FFMPEG_DVDATA_H
 #define FFMPEG_DVDATA_H
 
-#include <avcodec.h>
-#include <rational.h>
+#include <libavcodec/avcodec.h>
+#include <libavutil/rational.h>
 
 /*
  * DVprofile is used to express the differences between various
diff --git a/src/audio_dec/xine_a52_decoder.c b/src/audio_dec/xine_a52_decoder.c
index 71adf176a..69c07df46 100644
--- a/src/audio_dec/xine_a52_decoder.c
+++ b/src/audio_dec/xine_a52_decoder.c
@@ -62,8 +62,7 @@
 #include <xine/buffer.h>
 #include <xine/xineutils.h>
 
-/* libavutil from FFmpeg */
-#include <crc.h>
+#include <libavutil/crc.h>
 
 #undef DEBUG_A52
 #ifdef DEBUG_A52
diff --git a/src/demuxers/demux_mpeg_block.c b/src/demuxers/demux_mpeg_block.c
index 84bbf1492..a285d02d8 100644
--- a/src/demuxers/demux_mpeg_block.c
+++ b/src/demuxers/demux_mpeg_block.c
@@ -31,8 +31,7 @@
 #include <unistd.h>
 #include <string.h>
 
-/* libavutil from FFmpeg */
-#include <mem.h>
+#include <libavutil/mem.h>
 
 #define LOG_MODULE "demux_mpeg_block"
 #define LOG_VERBOSE
diff --git a/src/demuxers/demux_mpeg_pes.c b/src/demuxers/demux_mpeg_pes.c
index a4f8fced0..9a0b88c6f 100644
--- a/src/demuxers/demux_mpeg_pes.c
+++ b/src/demuxers/demux_mpeg_pes.c
@@ -35,8 +35,7 @@
 #include <unistd.h>
 #include <string.h>
 
-/* libavutil from FFmpeg */
-#include <mem.h>
+#include <libavutil/mem.h>
 
 #define LOG_MODULE "demux_mpeg_pes"
 #define LOG_VERBOSE
diff --git a/src/demuxers/demux_ts.c b/src/demuxers/demux_ts.c
index 5d85a5597..748170fd4 100644
--- a/src/demuxers/demux_ts.c
+++ b/src/demuxers/demux_ts.c
@@ -141,8 +141,7 @@
 #include <unistd.h>
 #include <string.h>
 
-/* libavutil from FFmpeg */
-#include <crc.h>
+#include <libavutil/crc.h>
 
 #define LOG_MODULE "demux_ts"
 #define LOG_VERBOSE
diff --git a/src/dxr3/dxr3_mpeg_encoders.c b/src/dxr3/dxr3_mpeg_encoders.c
index 2ccc05e49..f637a4566 100644
--- a/src/dxr3/dxr3_mpeg_encoders.c
+++ b/src/dxr3/dxr3_mpeg_encoders.c
@@ -44,8 +44,7 @@
 #include <math.h>
 #include <unistd.h>
 
-/* libavutil from FFmpeg */
-#include <mem.h>
+#include <libavutil/mem.h>
 
 #define LOG_MODULE "dxr3_mpeg_encoder"
 /* #define LOG_VERBOSE */
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) {
 
diff --git a/src/post/planar/noise.c b/src/post/planar/noise.c
index b1417801f..29d79fb14 100644
--- a/src/post/planar/noise.c
+++ b/src/post/planar/noise.c
@@ -27,8 +27,7 @@
 #include <math.h>
 #include <pthread.h>
 
-/* libavutil from FFmpeg */
-#include <mem.h>
+#include <libavutil/mem.h>
 
 #ifdef ARCH_X86_64
 #  define REG_a  "rax"
diff --git a/src/post/planar/pp.c b/src/post/planar/pp.c
index f8c571dcb..dc455a858 100644
--- a/src/post/planar/pp.c
+++ b/src/post/planar/pp.c
@@ -25,7 +25,7 @@
 #include <xine/xine_internal.h>
 #include <xine/post.h>
 #include <xine/xineutils.h>
-#include "postprocess.h"
+#include <libpostproc/postprocess.h>
 #include <pthread.h>
 
 #define PP_STRING_SIZE 256 /* size of pp mode string (including all options) */
diff --git a/src/video_dec/libmpeg2/decode.c b/src/video_dec/libmpeg2/decode.c
index b4e6e82c0..33d8b7ca9 100644
--- a/src/video_dec/libmpeg2/decode.c
+++ b/src/video_dec/libmpeg2/decode.c
@@ -37,8 +37,7 @@
 #define LOG
 */
 
-/* libavutil from FFmpeg */
-#include <mem.h>
+#include <libavutil/mem.h>
 
 #include <xine/xine_internal.h>
 #include <xine/video_out.h>
diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c
index 3b9b358db..dd2a97c28 100644
--- a/src/video_out/video_out_aa.c
+++ b/src/video_out/video_out_aa.c
@@ -35,8 +35,7 @@
 #include <sys/mman.h>
 #include <sys/time.h>
 
-/* libavutil from FFmpeg */
-#include <mem.h>
+#include <libavutil/mem.h>
 
 #include <aalib.h>
 
diff --git a/src/video_out/video_out_caca.c b/src/video_out/video_out_caca.c
index 04ca225d6..e9d5a7d85 100644
--- a/src/video_out/video_out_caca.c
+++ b/src/video_out/video_out_caca.c
@@ -37,8 +37,7 @@
 #include <cucul.h>
 #include <caca.h>
 
-/* libavutil from FFmpeg */
-#include <mem.h>
+#include <libavutil/mem.h>
 
 #include "xine.h"
 #include <xine/video_out.h>
diff --git a/src/video_out/video_out_fb.c b/src/video_out/video_out_fb.c
index dc3d683e1..d38a39917 100644
--- a/src/video_out/video_out_fb.c
+++ b/src/video_out/video_out_fb.c
@@ -68,8 +68,7 @@
 #include <pthread.h>
 #include <netinet/in.h>
 
-/* libavutil from FFmpeg */
-#include <mem.h>
+#include <libavutil/mem.h>
 
 #include <linux/fb.h>
 #include <linux/kd.h>
diff --git a/src/video_out/video_out_opengl.c b/src/video_out/video_out_opengl.c
index c1416963c..2f3faed13 100644
--- a/src/video_out/video_out_opengl.c
+++ b/src/video_out/video_out_opengl.c
@@ -47,8 +47,7 @@
 #include <ctype.h>
 #include <pthread.h>
 
-/* libavutil from FFmpeg */
-#include <mem.h>
+#include <libavutil/mem.h>
 
 /* defines for debugging extensions only */
 /* #define GL_GLEXT_LEGACY */
diff --git a/src/video_out/video_out_xcbshm.c b/src/video_out/video_out_xcbshm.c
index 7443529d1..6a6051658 100644
--- a/src/video_out/video_out_xcbshm.c
+++ b/src/video_out/video_out_xcbshm.c
@@ -50,8 +50,7 @@
 #include <pthread.h>
 #include <netinet/in.h>
 
-/* libavutil from FFmpeg */
-#include <mem.h>
+#include <libavutil/mem.h>
 
 #define LOG_MODULE "video_out_xcbshm"
 #define LOG_VERBOSE
diff --git a/src/video_out/video_out_xshm.c b/src/video_out/video_out_xshm.c
index 0df5c2806..e1fb1f339 100644
--- a/src/video_out/video_out_xshm.c
+++ b/src/video_out/video_out_xshm.c
@@ -51,8 +51,7 @@
 #include <pthread.h>
 #include <netinet/in.h>
 
-/* libavutil from FFmpeg */
-#include <mem.h>
+#include <libavutil/mem.h>
 
 #define LOG_MODULE "video_out_xshm"
 #define LOG_VERBOSE
diff --git a/src/video_out/yuv2rgb.c b/src/video_out/yuv2rgb.c
index 4a44c59d9..2ea882095 100644
--- a/src/video_out/yuv2rgb.c
+++ b/src/video_out/yuv2rgb.c
@@ -31,8 +31,7 @@
 #include <string.h>
 #include <inttypes.h>
 
-/* libavutil from FFmpeg */
-#include <mem.h>
+#include <libavutil/mem.h>
 
 #include "yuv2rgb.h"
 
diff --git a/src/video_out/yuv2rgb_mmx.c b/src/video_out/yuv2rgb_mmx.c
index 07f24b478..2a7c73cdf 100644
--- a/src/video_out/yuv2rgb_mmx.c
+++ b/src/video_out/yuv2rgb_mmx.c
@@ -31,8 +31,7 @@
 #include <string.h>
 #include <inttypes.h>
 
-/* libavutil from FFmpeg */
-#include <mem.h>
+#include <libavutil/mem.h>
 
 #include "yuv2rgb.h"
 #include <xine/xineutils.h>
diff --git a/src/xine-engine/buffer.c b/src/xine-engine/buffer.c
index bcef6df32..605fbaa09 100644
--- a/src/xine-engine/buffer.c
+++ b/src/xine-engine/buffer.c
@@ -36,8 +36,7 @@
 #include <stdlib.h>
 #include <assert.h>
 
-/* libavutil from FFmpeg */
-#include <mem.h>
+#include <libavutil/mem.h>
 
 /********** logging **********/
 #define LOG_MODULE "buffer"
-- 
cgit v1.2.3