summaryrefslogtreecommitdiff
path: root/src/video_out
diff options
context:
space:
mode:
authorDarren Salt <linux@youmustbejoking.demon.co.uk>2008-04-09 19:10:58 +0100
committerDarren Salt <linux@youmustbejoking.demon.co.uk>2008-04-09 19:10:58 +0100
commit8063ffb8c0b354d54834ba53b22003dac481de2c (patch)
tree2663524c8c6376ab1ee7dd2a620b0979fc80ddb3 /src/video_out
parent39939c95eff90545285a9a8f761d9fa6e9349358 (diff)
downloadxine-lib-8063ffb8c0b354d54834ba53b22003dac481de2c.tar.gz
xine-lib-8063ffb8c0b354d54834ba53b22003dac481de2c.tar.bz2
Compilation fixes, mostly ffmpeg-related, and linkage fixes.
Tests done on amd64 with ffmpeg 0.svn20080206 from Debian experimental. libavcodec 51.50.0, libavutil 49.6.0, libpostproc 51.1.0
Diffstat (limited to 'src/video_out')
-rw-r--r--src/video_out/video_out_aa.c2
-rw-r--r--src/video_out/video_out_caca.c2
-rw-r--r--src/video_out/video_out_fb.c2
-rw-r--r--src/video_out/video_out_opengl.c2
-rw-r--r--src/video_out/video_out_xcbshm.c2
-rw-r--r--src/video_out/video_out_xshm.c2
-rw-r--r--src/video_out/yuv2rgb.c2
-rw-r--r--src/video_out/yuv2rgb_mmx.c2
8 files changed, 8 insertions, 8 deletions
diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c
index dd2a97c28..3429e883f 100644
--- a/src/video_out/video_out_aa.c
+++ b/src/video_out/video_out_aa.c
@@ -35,7 +35,7 @@
#include <sys/mman.h>
#include <sys/time.h>
-#include <libavutil/mem.h>
+#include <mem.h>
#include <aalib.h>
diff --git a/src/video_out/video_out_caca.c b/src/video_out/video_out_caca.c
index e9d5a7d85..01aad0bc8 100644
--- a/src/video_out/video_out_caca.c
+++ b/src/video_out/video_out_caca.c
@@ -37,7 +37,7 @@
#include <cucul.h>
#include <caca.h>
-#include <libavutil/mem.h>
+#include <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 d38a39917..1efc39459 100644
--- a/src/video_out/video_out_fb.c
+++ b/src/video_out/video_out_fb.c
@@ -68,7 +68,7 @@
#include <pthread.h>
#include <netinet/in.h>
-#include <libavutil/mem.h>
+#include <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 2f3faed13..533b26a22 100644
--- a/src/video_out/video_out_opengl.c
+++ b/src/video_out/video_out_opengl.c
@@ -47,7 +47,7 @@
#include <ctype.h>
#include <pthread.h>
-#include <libavutil/mem.h>
+#include <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 6a6051658..1b2e90be8 100644
--- a/src/video_out/video_out_xcbshm.c
+++ b/src/video_out/video_out_xcbshm.c
@@ -50,7 +50,7 @@
#include <pthread.h>
#include <netinet/in.h>
-#include <libavutil/mem.h>
+#include <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 e1fb1f339..fba253b87 100644
--- a/src/video_out/video_out_xshm.c
+++ b/src/video_out/video_out_xshm.c
@@ -51,7 +51,7 @@
#include <pthread.h>
#include <netinet/in.h>
-#include <libavutil/mem.h>
+#include <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 2ea882095..127338ee5 100644
--- a/src/video_out/yuv2rgb.c
+++ b/src/video_out/yuv2rgb.c
@@ -31,7 +31,7 @@
#include <string.h>
#include <inttypes.h>
-#include <libavutil/mem.h>
+#include <mem.h>
#include "yuv2rgb.h"
diff --git a/src/video_out/yuv2rgb_mmx.c b/src/video_out/yuv2rgb_mmx.c
index 2a7c73cdf..52a683d30 100644
--- a/src/video_out/yuv2rgb_mmx.c
+++ b/src/video_out/yuv2rgb_mmx.c
@@ -31,7 +31,7 @@
#include <string.h>
#include <inttypes.h>
-#include <libavutil/mem.h>
+#include <mem.h>
#include "yuv2rgb.h"
#include <xine/xineutils.h>