summaryrefslogtreecommitdiffstats
path: root/common
diff options
context:
space:
mode:
Diffstat (limited to 'common')
-rw-r--r--common/codecs.c2
-rw-r--r--common/common.c2
-rw-r--r--common/common.h2
-rw-r--r--common/encode_lavc.c2
-rw-r--r--common/msg.c2
-rw-r--r--common/playlist.c2
6 files changed, 6 insertions, 6 deletions
diff --git a/common/codecs.c b/common/codecs.c
index 35d270989d..da0bd69db4 100644
--- a/common/codecs.c
+++ b/common/codecs.c
@@ -16,7 +16,7 @@
*/
#include <assert.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "misc/bstr.h"
#include "common/msg.h"
#include "codecs.h"
diff --git a/common/common.c b/common/common.c
index 7a651e9781..829dbde50c 100644
--- a/common/common.c
+++ b/common/common.c
@@ -21,7 +21,7 @@
#include <libavutil/common.h>
#include <libavutil/error.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "misc/bstr.h"
#include "misc/ctype.h"
#include "common/common.h"
diff --git a/common/common.h b/common/common.h
index 920ad76a56..8edfc96d23 100644
--- a/common/common.h
+++ b/common/common.h
@@ -24,7 +24,7 @@
#include <stdint.h>
#include "osdep/compiler.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
// double should be able to represent this exactly
#define MP_NOPTS_VALUE (-0x1p+63)
diff --git a/common/encode_lavc.c b/common/encode_lavc.c
index 2a01bee380..6dd47a3816 100644
--- a/common/encode_lavc.c
+++ b/common/encode_lavc.c
@@ -29,7 +29,7 @@
#include "options/options.h"
#include "osdep/timer.h"
#include "video/out/vo.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "stream/stream.h"
#define OPT_BASE_STRUCT struct encode_opts
diff --git a/common/msg.c b/common/msg.c
index 4576754337..01d0bb78a0 100644
--- a/common/msg.c
+++ b/common/msg.c
@@ -24,7 +24,7 @@
#include <pthread.h>
#include <stdint.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "misc/bstr.h"
#include "osdep/atomics.h"
diff --git a/common/playlist.c b/common/playlist.c
index fe197a8ded..5b91c3c60c 100644
--- a/common/playlist.c
+++ b/common/playlist.c
@@ -21,7 +21,7 @@
#include "common/common.h"
#include "common/global.h"
#include "common/msg.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "options/path.h"
#include "demux/demux.h"