summaryrefslogtreecommitdiff
path: root/src/xine-engine
diff options
context:
space:
mode:
Diffstat (limited to 'src/xine-engine')
-rw-r--r--src/xine-engine/buffer.c6
-rw-r--r--src/xine-engine/configfile.c6
2 files changed, 10 insertions, 2 deletions
diff --git a/src/xine-engine/buffer.c b/src/xine-engine/buffer.c
index 563999bbf..bf2ea41e9 100644
--- a/src/xine-engine/buffer.c
+++ b/src/xine-engine/buffer.c
@@ -36,7 +36,11 @@
#include <stdlib.h>
#include <assert.h>
-#include <mem.h>
+#ifdef HAVE_FFMPEG_AVUTIL_H
+# include <mem.h>
+#else
+# include <libavutil/mem.h>
+#endif
/********** logging **********/
#define LOG_MODULE "buffer"
diff --git a/src/xine-engine/configfile.c b/src/xine-engine/configfile.c
index 91113cdfc..f18cf6661 100644
--- a/src/xine-engine/configfile.c
+++ b/src/xine-engine/configfile.c
@@ -33,7 +33,11 @@
#include <unistd.h>
#include <xine/configfile.h>
#include "bswap.h"
-#include <base64.h>
+#ifdef HAVE_FFMPEG_AVUTIL_H
+# include <base64.h>
+#else
+# include <libavutil/base64.h>
+#endif
#define LOG_MODULE "configfile"
#define LOG_VERBOSE