summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--audio/audio.c2
-rw-r--r--audio/decode/ad_lavc.c2
-rw-r--r--audio/mixer.c2
-rw-r--r--audio/out/ao.c2
-rw-r--r--audio/out/ao_coreaudio_properties.c2
-rw-r--r--audio/out/ao_lavc.c2
-rw-r--r--audio/out/ao_null.c2
-rw-r--r--audio/out/ao_pcm.c2
-rw-r--r--audio/out/ao_rsound.c2
-rw-r--r--audio/out/ao_sdl.c2
-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
-rw-r--r--demux/cue.c2
-rw-r--r--demux/demux.c2
-rw-r--r--demux/demux_cue.c2
-rw-r--r--demux/demux_edl.c2
-rw-r--r--demux/demux_mf.c2
-rw-r--r--demux/demux_mkv.c2
-rw-r--r--demux/demux_mkv_timeline.c2
-rw-r--r--demux/ebml.c2
-rw-r--r--input/input.c2
-rw-r--r--misc/bstr.c2
-rw-r--r--misc/bstr.h2
-rw-r--r--misc/ring.c2
-rw-r--r--mpv_talloc.h (renamed from talloc.h)0
-rw-r--r--options/m_config.c2
-rw-r--r--options/m_option.c2
-rw-r--r--options/m_property.c2
-rw-r--r--options/path.c2
-rw-r--r--osdep/glob-win.c2
-rw-r--r--osdep/io.c2
-rw-r--r--osdep/macosx_application.m2
-rw-r--r--osdep/macosx_events.m2
-rw-r--r--osdep/subprocess-win.c2
-rw-r--r--player/audio.c2
-rw-r--r--player/command.c2
-rw-r--r--player/configfiles.c2
-rw-r--r--player/loadfile.c2
-rw-r--r--player/lua.c2
-rw-r--r--player/main.c2
-rw-r--r--player/misc.c2
-rw-r--r--player/osd.c2
-rw-r--r--player/playloop.c2
-rw-r--r--player/screenshot.c2
-rw-r--r--player/sub.c2
-rw-r--r--player/video.c2
-rw-r--r--stream/rar.c2
-rw-r--r--stream/stream.c2
-rw-r--r--stream/stream_bluray.c2
-rw-r--r--stream/stream_cdda.c2
-rw-r--r--stream/stream_dvd.c2
-rw-r--r--stream/stream_lavf.c2
-rw-r--r--sub/img_convert.c2
-rw-r--r--sub/lavc_conv.c2
-rw-r--r--sub/osd.c2
-rw-r--r--sub/osd_dummy.c2
-rw-r--r--sub/osd_libass.c2
-rw-r--r--sub/sd_ass.c2
-rw-r--r--sub/sd_lavc.c2
-rw-r--r--video/decode/vd_lavc.c2
-rw-r--r--video/filter/vf_buffer.c2
-rw-r--r--video/image_writer.c2
-rw-r--r--video/mp_image.c2
-rw-r--r--video/mp_image_pool.c2
-rw-r--r--video/out/bitmap_packer.c2
-rw-r--r--video/out/cocoa_common.m2
-rw-r--r--video/out/dither.c2
-rw-r--r--video/out/opengl/lcms.c2
-rw-r--r--video/out/vo.c2
-rw-r--r--video/out/vo_direct3d.c2
-rw-r--r--video/out/vo_image.c2
-rw-r--r--video/out/vo_lavc.c2
-rw-r--r--video/out/vo_opengl.c2
-rw-r--r--video/out/vo_opengl_cb.c2
-rw-r--r--video/out/vo_vdpau.c2
-rw-r--r--video/out/vo_xv.c2
-rw-r--r--video/out/w32_common.c2
-rw-r--r--video/out/wayland_common.c2
-rw-r--r--video/out/win32/displayconfig.c2
-rw-r--r--video/out/x11_common.c2
84 files changed, 83 insertions, 83 deletions
diff --git a/audio/audio.c b/audio/audio.c
index c4ad4021b5..157649c3f8 100644
--- a/audio/audio.c
+++ b/audio/audio.c
@@ -24,7 +24,7 @@
#include <libavutil/frame.h>
#include <libavutil/version.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "common/common.h"
#include "fmt-conversion.h"
#include "audio.h"
diff --git a/audio/decode/ad_lavc.c b/audio/decode/ad_lavc.c
index 3188834830..f4a0a243d1 100644
--- a/audio/decode/ad_lavc.c
+++ b/audio/decode/ad_lavc.c
@@ -26,7 +26,7 @@
#include <libavutil/common.h>
#include <libavutil/intreadwrite.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "config.h"
#include "common/av_common.h"
diff --git a/audio/mixer.c b/audio/mixer.c
index deeea1b3e5..5f147872ab 100644
--- a/audio/mixer.c
+++ b/audio/mixer.c
@@ -27,7 +27,7 @@
#include "audio/filter/af.h"
#include "common/global.h"
#include "common/msg.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "mixer.h"
struct mixer {
diff --git a/audio/out/ao.c b/audio/out/ao.c
index c950b9e773..ffcc43ab79 100644
--- a/audio/out/ao.c
+++ b/audio/out/ao.c
@@ -20,7 +20,7 @@
#include <string.h>
#include <assert.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "config.h"
#include "ao.h"
diff --git a/audio/out/ao_coreaudio_properties.c b/audio/out/ao_coreaudio_properties.c
index cf2b4d14a1..b74cf07289 100644
--- a/audio/out/ao_coreaudio_properties.c
+++ b/audio/out/ao_coreaudio_properties.c
@@ -21,7 +21,7 @@
#include "audio/out/ao_coreaudio_properties.h"
#include "audio/out/ao_coreaudio_utils.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
OSStatus ca_get(AudioObjectID id, ca_scope scope, ca_sel selector,
uint32_t size, void *data)
diff --git a/audio/out/ao_lavc.c b/audio/out/ao_lavc.c
index 332350fd17..b671301922 100644
--- a/audio/out/ao_lavc.c
+++ b/audio/out/ao_lavc.c
@@ -31,7 +31,7 @@
#include "common/common.h"
#include "audio/format.h"
#include "audio/fmt-conversion.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "ao.h"
#include "internal.h"
#include "common/msg.h"
diff --git a/audio/out/ao_null.c b/audio/out/ao_null.c
index 0af0a97b96..7d45795d9e 100644
--- a/audio/out/ao_null.c
+++ b/audio/out/ao_null.c
@@ -26,7 +26,7 @@
#include <stdlib.h>
#include <math.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "config.h"
#include "osdep/timer.h"
diff --git a/audio/out/ao_pcm.c b/audio/out/ao_pcm.c
index 76f0315bef..c26f614f2d 100644
--- a/audio/out/ao_pcm.c
+++ b/audio/out/ao_pcm.c
@@ -27,7 +27,7 @@
#include <libavutil/common.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "options/m_option.h"
#include "audio/format.h"
diff --git a/audio/out/ao_rsound.c b/audio/out/ao_rsound.c
index 0385b09cb8..5379e73a72 100644
--- a/audio/out/ao_rsound.c
+++ b/audio/out/ao_rsound.c
@@ -26,7 +26,7 @@
#include <unistd.h>
#include <rsound.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "options/m_option.h"
#include "osdep/timer.h"
diff --git a/audio/out/ao_sdl.c b/audio/out/ao_sdl.c
index bf65a4a4d8..5e5bd25b96 100644
--- a/audio/out/ao_sdl.c
+++ b/audio/out/ao_sdl.c
@@ -20,7 +20,7 @@
#include "config.h"
#include "audio/format.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "ao.h"
#include "internal.h"
#include "common/common.h"
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"
diff --git a/demux/cue.c b/demux/cue.c
index 50ce4b7639..4a84107db7 100644
--- a/demux/cue.c
+++ b/demux/cue.c
@@ -20,7 +20,7 @@
#include <string.h>
#include <inttypes.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "misc/bstr.h"
#include "common/common.h"
diff --git a/demux/demux.c b/demux/demux.c
index d8a3030d33..b251674496 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -29,7 +29,7 @@
#include "config.h"
#include "options/options.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "common/msg.h"
#include "common/global.h"
#include "osdep/threads.h"
diff --git a/demux/demux_cue.c b/demux/demux_cue.c
index da84fc60c1..bef1516057 100644
--- a/demux/demux_cue.c
+++ b/demux/demux_cue.c
@@ -23,7 +23,7 @@
#include <dirent.h>
#include <inttypes.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "misc/bstr.h"
#include "common/msg.h"
diff --git a/demux/demux_edl.c b/demux/demux_edl.c
index 9ba0307487..74ce7aef66 100644
--- a/demux/demux_edl.c
+++ b/demux/demux_edl.c
@@ -23,7 +23,7 @@
#include <inttypes.h>
#include <math.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "demux.h"
#include "timeline.h"
diff --git a/demux/demux_mf.c b/demux/demux_mf.c
index 3f79c547f1..b41bf87aa3 100644
--- a/demux/demux_mf.c
+++ b/demux/demux_mf.c
@@ -24,7 +24,7 @@
#include "osdep/io.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "common/msg.h"
#include "options/options.h"
#include "options/path.h"
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index 7f32e8d810..3951452074 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -41,7 +41,7 @@
#include <zlib.h>
#endif
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "common/av_common.h"
#include "options/options.h"
#include "options/m_option.h"
diff --git a/demux/demux_mkv_timeline.c b/demux/demux_mkv_timeline.c
index f784f2d010..9212f6b39d 100644
--- a/demux/demux_mkv_timeline.c
+++ b/demux/demux_mkv_timeline.c
@@ -29,7 +29,7 @@
#include "osdep/io.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "common/msg.h"
#include "common/global.h"
diff --git a/demux/ebml.c b/demux/ebml.c
index dbdc5e26ea..abbb73cfac 100644
--- a/demux/ebml.c
+++ b/demux/ebml.c
@@ -30,7 +30,7 @@
#include <libavutil/intfloat.h>
#include <libavutil/common.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "ebml.h"
#include "stream/stream.h"
#include "common/msg.h"
diff --git a/input/input.c b/input/input.c
index 2e7d6d30ef..d1c69a9587 100644
--- a/input/input.c
+++ b/input/input.c
@@ -48,7 +48,7 @@
#include "options/m_config.h"
#include "options/m_option.h"
#include "options/path.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "options/options.h"
#include "misc/bstr.h"
#include "stream/stream.h"
diff --git a/misc/bstr.c b/misc/bstr.c
index b168acc077..13441eede9 100644
--- a/misc/bstr.c
+++ b/misc/bstr.c
@@ -24,7 +24,7 @@
#include <libavutil/common.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "common/common.h"
#include "misc/ctype.h"
diff --git a/misc/bstr.h b/misc/bstr.h
index ef5591a61d..f56516663c 100644
--- a/misc/bstr.h
+++ b/misc/bstr.h
@@ -24,7 +24,7 @@
#include <stdbool.h>
#include <stdarg.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "osdep/compiler.h"
/* NOTE: 'len' is size_t, but most string-handling functions below assume
diff --git a/misc/ring.c b/misc/ring.c
index 41c9c6a99e..9921dd15d4 100644
--- a/misc/ring.c
+++ b/misc/ring.c
@@ -20,7 +20,7 @@
#include <inttypes.h>
#include <libavutil/common.h>
#include <assert.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "osdep/atomics.h"
#include "ring.h"
diff --git a/talloc.h b/mpv_talloc.h
index 11f996b34d..11f996b34d 100644
--- a/talloc.h
+++ b/mpv_talloc.h
diff --git a/options/m_config.c b/options/m_config.c
index 0f112dcefb..d58c406ed8 100644
--- a/options/m_config.c
+++ b/options/m_config.c
@@ -30,7 +30,7 @@
#include "libmpv/client.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "m_config.h"
#include "options/m_option.h"
diff --git a/options/m_option.c b/options/m_option.c
index 020bd371ce..9f2d8758d0 100644
--- a/options/m_option.c
+++ b/options/m_option.c
@@ -36,7 +36,7 @@
#include "libmpv/client.h"
#include "player/client.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "common/common.h"
#include "common/msg.h"
#include "common/msg_control.h"
diff --git a/options/m_property.c b/options/m_property.c
index 9318d5b7d2..951b788d4b 100644
--- a/options/m_property.c
+++ b/options/m_property.c
@@ -30,7 +30,7 @@
#include "libmpv/client.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "m_option.h"
#include "m_property.h"
#include "common/msg.h"
diff --git a/options/path.c b/options/path.c
index adfd2ded3e..cd1deb6e78 100644
--- a/options/path.c
+++ b/options/path.c
@@ -39,7 +39,7 @@
#include "common/msg.h"
#include "options/options.h"
#include "options/path.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "osdep/io.h"
#include "osdep/path.h"
diff --git a/osdep/glob-win.c b/osdep/glob-win.c
index 30dad4dfc5..cca226ae7a 100644
--- a/osdep/glob-win.c
+++ b/osdep/glob-win.c
@@ -19,7 +19,7 @@
#include <stdbool.h>
#include <string.h>
#include "osdep/io.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
static wchar_t *talloc_wcsdup(void *ctx, const wchar_t *wcs)
{
diff --git a/osdep/io.c b/osdep/io.c
index fdb625d080..5f46cdb69b 100644
--- a/osdep/io.c
+++ b/osdep/io.c
@@ -23,7 +23,7 @@
#include <errno.h>
#include <assert.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "config.h"
#include "osdep/io.h"
diff --git a/osdep/macosx_application.m b/osdep/macosx_application.m
index 6e91809464..21d57b497d 100644
--- a/osdep/macosx_application.m
+++ b/osdep/macosx_application.m
@@ -17,7 +17,7 @@
#include <stdio.h>
#include <pthread.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "common/msg.h"
#include "input/input.h"
diff --git a/osdep/macosx_events.m b/osdep/macosx_events.m
index ae909d8e43..51aaf2aca4 100644
--- a/osdep/macosx_events.m
+++ b/osdep/macosx_events.m
@@ -25,7 +25,7 @@
#import <IOKit/hidsystem/ev_keymap.h>
#import <Cocoa/Cocoa.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "input/event.h"
#include "input/input.h"
#include "input/keycodes.h"
diff --git a/osdep/subprocess-win.c b/osdep/subprocess-win.c
index 10ebda0111..76e4964183 100644
--- a/osdep/subprocess-win.c
+++ b/osdep/subprocess-win.c
@@ -23,7 +23,7 @@
#include "osdep/io.h"
#include "osdep/atomics.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "common/common.h"
#include "stream/stream.h"
#include "misc/bstr.h"
diff --git a/player/audio.c b/player/audio.c
index cc166ae0d3..8cbdb5aefa 100644
--- a/player/audio.c
+++ b/player/audio.c
@@ -23,7 +23,7 @@
#include <assert.h>
#include "config.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "common/msg.h"
#include "common/encode.h"
diff --git a/player/command.c b/player/command.c
index 53ac5c1828..135d092d8b 100644
--- a/player/command.c
+++ b/player/command.c
@@ -30,7 +30,7 @@
#include <libavutil/common.h>
#include "config.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "client.h"
#include "common/msg.h"
#include "common/msg_control.h"
diff --git a/player/configfiles.c b/player/configfiles.c
index 678d60ddc0..3c42331de0 100644
--- a/player/configfiles.c
+++ b/player/configfiles.c
@@ -25,7 +25,7 @@
#include <libavutil/md5.h>
#include "config.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "osdep/io.h"
diff --git a/player/loadfile.c b/player/loadfile.c
index 0fa4234ca6..b28b9f3cc4 100644
--- a/player/loadfile.c
+++ b/player/loadfile.c
@@ -24,7 +24,7 @@
#include <libavutil/avutil.h>
#include "config.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "osdep/io.h"
#include "osdep/terminal.h"
diff --git a/player/lua.c b/player/lua.c
index 3bf5298578..92caa90b19 100644
--- a/player/lua.c
+++ b/player/lua.c
@@ -30,7 +30,7 @@
#include "osdep/io.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "common/common.h"
#include "options/m_property.h"
diff --git a/player/main.c b/player/main.c
index c6d1e969c7..046d41c6b2 100644
--- a/player/main.c
+++ b/player/main.c
@@ -25,7 +25,7 @@
#include <signal.h>
#include "config.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "misc/dispatch.h"
#include "osdep/io.h"
diff --git a/player/misc.c b/player/misc.c
index d60f25f05b..58dd6af4f9 100644
--- a/player/misc.c
+++ b/player/misc.c
@@ -21,7 +21,7 @@
#include <assert.h>
#include "config.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "osdep/io.h"
#include "osdep/timer.h"
diff --git a/player/osd.c b/player/osd.c
index da1fb41521..51327f9c10 100644
--- a/player/osd.c
+++ b/player/osd.c
@@ -23,7 +23,7 @@
#include <assert.h>
#include "config.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "common/msg.h"
#include "common/msg_control.h"
diff --git a/player/playloop.c b/player/playloop.c
index b672c24483..382a1c4b27 100644
--- a/player/playloop.c
+++ b/player/playloop.c
@@ -22,7 +22,7 @@
#include <assert.h>
#include "config.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "common/msg.h"
#include "options/options.h"
diff --git a/player/screenshot.c b/player/screenshot.c
index 76c7874498..3fc0b90c98 100644
--- a/player/screenshot.c
+++ b/player/screenshot.c
@@ -23,7 +23,7 @@
#include "osdep/io.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "screenshot.h"
#include "core.h"
#include "command.h"
diff --git a/player/sub.c b/player/sub.c
index dd1ba6d384..5f2f13e88f 100644
--- a/player/sub.c
+++ b/player/sub.c
@@ -22,7 +22,7 @@
#include <assert.h>
#include "config.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "common/msg.h"
#include "options/options.h"
diff --git a/player/video.c b/player/video.c
index 74d6eb32b9..7f1ab4dc21 100644
--- a/player/video.c
+++ b/player/video.c
@@ -22,7 +22,7 @@
#include <assert.h>
#include "config.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "common/msg.h"
#include "options/options.h"
diff --git a/stream/rar.c b/stream/rar.c
index d0dbc8d736..9a74097ce7 100644
--- a/stream/rar.c
+++ b/stream/rar.c
@@ -31,7 +31,7 @@
#include <libavutil/intreadwrite.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "common/common.h"
#include "stream.h"
#include "rar.h"
diff --git a/stream/stream.c b/stream/stream.c
index cf9a8ea143..77eccd76ca 100644
--- a/stream/stream.c
+++ b/stream/stream.c
@@ -29,7 +29,7 @@
#include "osdep/atomics.h"
#include "osdep/io.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "config.h"
diff --git a/stream/stream_bluray.c b/stream/stream_bluray.c
index b40c3275b3..7a58d888b9 100644
--- a/stream/stream_bluray.c
+++ b/stream/stream_bluray.c
@@ -38,7 +38,7 @@
#include <libavutil/common.h>
#include "config.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "common/common.h"
#include "common/msg.h"
#include "options/m_option.h"
diff --git a/stream/stream_cdda.c b/stream/stream_cdda.c
index 6781f4a0ad..8fadf3452a 100644
--- a/stream/stream_cdda.c
+++ b/stream/stream_cdda.c
@@ -37,7 +37,7 @@
#include <stdlib.h>
#include <stdbool.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "stream.h"
#include "options/m_option.h"
diff --git a/stream/stream_dvd.c b/stream/stream_dvd.c
index 641305e7a8..55cb6dfc7b 100644
--- a/stream/stream_dvd.c
+++ b/stream/stream_dvd.c
@@ -35,7 +35,7 @@
#include "osdep/io.h"
#include "config.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "common/common.h"
#include "common/msg.h"
diff --git a/stream/stream_lavf.c b/stream/stream_lavf.c
index ac092499b3..d899629571 100644
--- a/stream/stream_lavf.c
+++ b/stream/stream_lavf.c
@@ -30,7 +30,7 @@
#include "cookies.h"
#include "misc/bstr.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#define OPT_BASE_STRUCT struct stream_lavf_params
struct stream_lavf_params {
diff --git a/sub/img_convert.c b/sub/img_convert.c
index 1db73e1b82..4fdca3d1e2 100644
--- a/sub/img_convert.c
+++ b/sub/img_convert.c
@@ -21,7 +21,7 @@
#include <libavutil/mem.h>
#include <libavutil/common.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "common/common.h"
#include "img_convert.h"
diff --git a/sub/lavc_conv.c b/sub/lavc_conv.c
index b244240d7c..42f9563391 100644
--- a/sub/lavc_conv.c
+++ b/sub/lavc_conv.c
@@ -24,7 +24,7 @@
#include "config.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "common/msg.h"
#include "common/av_common.h"
#include "misc/bstr.h"
diff --git a/sub/osd.c b/sub/osd.c
index ba4011c040..63d6136b9f 100644
--- a/sub/osd.c
+++ b/sub/osd.c
@@ -28,7 +28,7 @@
#include "osdep/timer.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "options/options.h"
#include "common/global.h"
#include "common/msg.h"
diff --git a/sub/osd_dummy.c b/sub/osd_dummy.c
index 5a33321d07..5c50569dd6 100644
--- a/sub/osd_dummy.c
+++ b/sub/osd_dummy.c
@@ -3,7 +3,7 @@
#include <string.h>
#include "config.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "osd.h"
const char *const osd_ass_0 = "";
diff --git a/sub/osd_libass.c b/sub/osd_libass.c
index 6bb125723b..0c24483e32 100644
--- a/sub/osd_libass.c
+++ b/sub/osd_libass.c
@@ -24,7 +24,7 @@
#include "config.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "misc/bstr.h"
#include "common/common.h"
#include "common/msg.h"
diff --git a/sub/sd_ass.c b/sub/sd_ass.c
index 767ad927e2..658e952c28 100644
--- a/sub/sd_ass.c
+++ b/sub/sd_ass.c
@@ -24,7 +24,7 @@
#include <libavutil/common.h>
#include <ass/ass.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "options/options.h"
#include "common/common.h"
diff --git a/sub/sd_lavc.c b/sub/sd_lavc.c
index d9b9f507e7..ae08026d9a 100644
--- a/sub/sd_lavc.c
+++ b/sub/sd_lavc.c
@@ -25,7 +25,7 @@
#include "config.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "common/msg.h"
#include "common/av_common.h"
#include "demux/stheader.h"
diff --git a/video/decode/vd_lavc.c b/video/decode/vd_lavc.c
index d3c0de2c76..614ec787ec 100644
--- a/video/decode/vd_lavc.c
+++ b/video/decode/vd_lavc.c
@@ -27,7 +27,7 @@
#include <libavutil/intreadwrite.h>
#include <libavutil/pixdesc.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "config.h"
#include "common/msg.h"
#include "options/options.h"
diff --git a/video/filter/vf_buffer.c b/video/filter/vf_buffer.c
index 5a27c35796..772f7cbe72 100644
--- a/video/filter/vf_buffer.c
+++ b/video/filter/vf_buffer.c
@@ -3,7 +3,7 @@
#include <string.h>
#include <inttypes.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "options/m_option.h"
diff --git a/video/image_writer.c b/video/image_writer.c
index 50dc42aff5..4ea7c0c1df 100644
--- a/video/image_writer.c
+++ b/video/image_writer.c
@@ -32,7 +32,7 @@
#include "osdep/io.h"
#include "image_writer.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "video/img_format.h"
#include "video/mp_image.h"
#include "video/fmt-conversion.h"
diff --git a/video/mp_image.c b/video/mp_image.c
index dfd7d0dc77..7dd075be99 100644
--- a/video/mp_image.c
+++ b/video/mp_image.c
@@ -30,7 +30,7 @@
#include <libavutil/rational.h>
#include <libavcodec/avcodec.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "img_format.h"
#include "mp_image.h"
diff --git a/video/mp_image_pool.c b/video/mp_image_pool.c
index 5992c631f9..6c289f3edf 100644
--- a/video/mp_image_pool.c
+++ b/video/mp_image_pool.c
@@ -24,7 +24,7 @@
#include <libavutil/buffer.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "common/common.h"
#include "video/mp_image.h"
diff --git a/video/out/bitmap_packer.c b/video/out/bitmap_packer.c
index 49a66caf43..c9111f897c 100644
--- a/video/out/bitmap_packer.c
+++ b/video/out/bitmap_packer.c
@@ -25,7 +25,7 @@
#include <libavutil/common.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "bitmap_packer.h"
#include "common/common.h"
#include "sub/dec_sub.h"
diff --git a/video/out/cocoa_common.m b/video/out/cocoa_common.m
index b88d42ae19..455a13d074 100644
--- a/video/out/cocoa_common.m
+++ b/video/out/cocoa_common.m
@@ -45,7 +45,7 @@
#include "win_state.h"
#include "input/input.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "common/msg.h"
diff --git a/video/out/dither.c b/video/out/dither.c
index a164ee85a3..e463eb8cb7 100644
--- a/video/out/dither.c
+++ b/video/out/dither.c
@@ -35,7 +35,7 @@
#include <libavutil/lfg.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "dither.h"
#define MAX_SIZEB 8
diff --git a/video/out/opengl/lcms.c b/video/out/opengl/lcms.c
index 469f2bc262..1c49e8c8aa 100644
--- a/video/out/opengl/lcms.c
+++ b/video/out/opengl/lcms.c
@@ -22,7 +22,7 @@
#include <string.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "config.h"
diff --git a/video/out/vo.c b/video/out/vo.c
index f65ff864e5..5c56f62690 100644
--- a/video/out/vo.c
+++ b/video/out/vo.c
@@ -28,7 +28,7 @@
#include <poll.h>
#endif
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "config.h"
#include "osdep/timer.h"
diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c
index f9a5cb092f..811a3e43a9 100644
--- a/video/out/vo_direct3d.c
+++ b/video/out/vo_direct3d.c
@@ -29,7 +29,7 @@
#include "config.h"
#include "options/options.h"
#include "options/m_option.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "vo.h"
#include "video/csputils.h"
#include "video/mp_image.h"
diff --git a/video/out/vo_image.c b/video/out/vo_image.c
index e51d90fb3f..a848c69289 100644
--- a/video/out/vo_image.c
+++ b/video/out/vo_image.c
@@ -28,7 +28,7 @@
#include "misc/bstr.h"
#include "osdep/io.h"
#include "options/path.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "common/common.h"
#include "common/msg.h"
#include "video/out/vo.h"
diff --git a/video/out/vo_lavc.c b/video/out/vo_lavc.c
index aae7f7b934..bd07d10208 100644
--- a/video/out/vo_lavc.c
+++ b/video/out/vo_lavc.c
@@ -26,7 +26,7 @@
#include "options/options.h"
#include "video/fmt-conversion.h"
#include "video/mp_image.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "vo.h"
#include "common/encode_lavc.h"
diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c
index 1715475823..12dd6b9e3e 100644
--- a/video/out/vo_opengl.c
+++ b/video/out/vo_opengl.c
@@ -33,7 +33,7 @@
#include "config.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "common/common.h"
#include "misc/bstr.h"
#include "common/msg.h"
diff --git a/video/out/vo_opengl_cb.c b/video/out/vo_opengl_cb.c
index 2a8dfe2974..5b8bf72b99 100644
--- a/video/out/vo_opengl_cb.c
+++ b/video/out/vo_opengl_cb.c
@@ -9,7 +9,7 @@
#include "config.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "common/common.h"
#include "misc/bstr.h"
#include "common/msg.h"
diff --git a/video/out/vo_vdpau.c b/video/out/vo_vdpau.c
index 54f95c61e9..b85780e5f8 100644
--- a/video/out/vo_vdpau.c
+++ b/video/out/vo_vdpau.c
@@ -39,7 +39,7 @@
#include "video/hwdec.h"
#include "common/msg.h"
#include "options/options.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "vo.h"
#include "x11_common.h"
#include "video/csputils.h"
diff --git a/video/out/vo_xv.c b/video/out/vo_xv.c
index e799e8fc45..ad40fd8376 100644
--- a/video/out/vo_xv.c
+++ b/video/out/vo_xv.c
@@ -42,7 +42,7 @@
#include <X11/extensions/Xvlib.h>
#include "options/options.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "common/msg.h"
#include "vo.h"
#include "video/mp_image.h"
diff --git a/video/out/w32_common.c b/video/out/w32_common.c
index 025b744838..6eac4cde61 100644
--- a/video/out/w32_common.c
+++ b/video/out/w32_common.c
@@ -43,7 +43,7 @@
#include "osdep/atomics.h"
#include "misc/dispatch.h"
#include "misc/rendezvous.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
static const wchar_t classname[] = L"mpv";
diff --git a/video/out/wayland_common.c b/video/out/wayland_common.c
index b56ea8aa4c..8ef230c754 100644
--- a/video/out/wayland_common.c
+++ b/video/out/wayland_common.c
@@ -34,7 +34,7 @@
#include "misc/bstr.h"
#include "options/options.h"
#include "common/msg.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "wayland_common.h"
diff --git a/video/out/win32/displayconfig.c b/video/out/win32/displayconfig.c
index 635e8b6b36..cc91450b75 100644
--- a/video/out/win32/displayconfig.c
+++ b/video/out/win32/displayconfig.c
@@ -22,7 +22,7 @@
#include "displayconfig.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
// Some DisplayConfig definitions are broken in mingw-w64 (as of 2015-3-13.) To
// get the correct struct alignment, it's necessary to define them properly.
diff --git a/video/out/x11_common.c b/video/out/x11_common.c
index 11b0c12454..4c7237dd82 100644
--- a/video/out/x11_common.c
+++ b/video/out/x11_common.c
@@ -29,7 +29,7 @@
#include "input/input.h"
#include "input/event.h"
#include "x11_common.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include <string.h>
#include <unistd.h>