Allow for <libavutil/base64.h> etc.

Fixes build failures with some ffmpeg dev packages, e.g. from debian-multimedia.

9 files changed, 45 insertions, 9 deletions

diff --git a/src/video_out/video_out_aa.c b/src/video_out/video_out_aa.c
index 7c021a090..2eaf9e239 100644
--- a/src/video_out/video_out_aa.c
+++ b/src/video_out/video_out_aa.c
@@ -35,7 +35,11 @@
 #include <sys/mman.h>
 #include <sys/time.h>
 
-#include <mem.h>
+#ifdef HAVE_FFMPEG_AVUTIL_H
+#  include <mem.h>
+#else
+#  include <libavutil/mem.h>
+#endif
 
 #include <aalib.h>
 
diff --git a/src/video_out/video_out_caca.c b/src/video_out/video_out_caca.c
index 60552764f..084b43a7a 100644
--- a/src/video_out/video_out_caca.c
+++ b/src/video_out/video_out_caca.c
@@ -37,7 +37,11 @@
 #include <cucul.h>
 #include <caca.h>
 
-#include <mem.h>
+#ifdef HAVE_FFMPEG_AVUTIL_H
+#  include <mem.h>
+#else
+#  include <libavutil/mem.h>
+#endif
 
 #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 107d2a133..f37b345ce 100644
--- a/src/video_out/video_out_fb.c
+++ b/src/video_out/video_out_fb.c
@@ -68,7 +68,11 @@
 #include <pthread.h>
 #include <netinet/in.h>
 
-#include <mem.h>
+#ifdef HAVE_FFMPEG_AVUTIL_H
+#  include <mem.h>
+#else
+#  include <libavutil/mem.h>
+#endif
 
 #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 9656f9551..4aeaab325 100644
--- a/src/video_out/video_out_opengl.c
+++ b/src/video_out/video_out_opengl.c
@@ -47,7 +47,11 @@
 #include <ctype.h>
 #include <pthread.h>
 
-#include <mem.h>
+#ifdef HAVE_FFMPEG_AVUTIL_H
+#  include <mem.h>
+#else
+#  include <libavutil/mem.h>
+#endif
 
 /* defines for debugging extensions only */
 /* #define GL_GLEXT_LEGACY */
diff --git a/src/video_out/video_out_raw.c b/src/video_out/video_out_raw.c
index 227331f2f..e6961c4a7 100644
--- a/src/video_out/video_out_raw.c
+++ b/src/video_out/video_out_raw.c
@@ -54,7 +54,11 @@
 #include "yuv2rgb.h"
 #include <xine/xineutils.h>
 
-#include <mem.h>
+#ifdef HAVE_FFMPEG_AVUTIL_H
+#  include <mem.h>
+#else
+#  include <libavutil/mem.h>
+#endif
 
 typedef struct {
   vo_frame_t         vo_frame;
diff --git a/src/video_out/video_out_xcbshm.c b/src/video_out/video_out_xcbshm.c
index 509412eb6..9adafa44b 100644
--- a/src/video_out/video_out_xcbshm.c
+++ b/src/video_out/video_out_xcbshm.c
@@ -50,7 +50,11 @@
 #include <pthread.h>
 #include <netinet/in.h>
 
-#include <mem.h>
+#ifdef HAVE_FFMPEG_AVUTIL_H
+#  include <mem.h>
+#else
+#  include <libavutil/mem.h>
+#endif
 
 #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 54cac9d46..efb4a55d2 100644
--- a/src/video_out/video_out_xshm.c
+++ b/src/video_out/video_out_xshm.c
@@ -51,7 +51,11 @@
 #include <pthread.h>
 #include <netinet/in.h>
 
-#include <mem.h>
+#ifdef HAVE_FFMPEG_AVUTIL_H
+#  include <mem.h>
+#else
+#  include <libavutil/mem.h>
+#endif
 
 #define LOG_MODULE "video_out_xshm"
 #define LOG_VERBOSE
diff --git a/src/video_out/yuv2rgb.c b/src/video_out/yuv2rgb.c
index 7def639a4..694a966f8 100644
--- a/src/video_out/yuv2rgb.c
+++ b/src/video_out/yuv2rgb.c
@@ -31,7 +31,11 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include <mem.h>
+#ifdef HAVE_FFMPEG_AVUTIL_H
+#  include <mem.h>
+#else
+#  include <libavutil/mem.h>
+#endif
 
 #include "yuv2rgb.h"
 
diff --git a/src/video_out/yuv2rgb_mmx.c b/src/video_out/yuv2rgb_mmx.c
index 52a683d30..08b288f22 100644
--- a/src/video_out/yuv2rgb_mmx.c
+++ b/src/video_out/yuv2rgb_mmx.c
@@ -31,7 +31,11 @@
 #include <string.h>
 #include <inttypes.h>
 
-#include <mem.h>
+#ifdef HAVE_FFMPEG_AVUTIL_H
+#  include <mem.h>
+#else
+#  include <libavutil/mem.h>
+#endif
 
 #include "yuv2rgb.h"
 #include <xine/xineutils.h>