diff options
author | Dmitrij D. Czarkoff <czarkoff@gmail.com> | 2016-01-11 19:03:40 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2016-01-11 21:05:55 +0100 |
commit | ea442fa047819ec2e48a3dbe8ea21959ac3d70b0 (patch) | |
tree | 7eee2d4734a8bc8de35a9e6dd74d75051df64380 | |
parent | 0915a8497b12a7b526e0e8eae322eb8deb31eace (diff) | |
download | mpv-ea442fa047819ec2e48a3dbe8ea21959ac3d70b0.tar.bz2 mpv-ea442fa047819ec2e48a3dbe8ea21959ac3d70b0.tar.xz |
mpv_talloc.h: rename from talloc.h
This change helps avoiding conflict with talloc.h from libtalloc.
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/option |