mpv_talloc.h: rename from talloc.h

This change helps avoiding conflict with talloc.h from libtalloc.

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"

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"

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 {

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"

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)

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"

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"

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"

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"

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"

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"

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"

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)

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

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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

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"
 

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"

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"

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"

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"
 

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)
 {

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"

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"

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"

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"

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"

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"

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"
 

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"

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"
 

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"

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"

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"
 

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 {

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"

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"

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"

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 = "";

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"

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"

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"

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"

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"
 

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"

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"

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"

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"

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"
 

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

video/out/opengl/lcms.c

@@ -22,7 +22,7 @@
 
 #include <string.h>
 
-#include "talloc.h"
+#include "mpv_talloc.h"
 
 #include "config.h"
 

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"

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"

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"

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"

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"

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"

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"

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"

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";
 

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"
 

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.

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>