mpv_talloc.h: rename from talloc.h

This change helps avoiding conflict with talloc.h from libtalloc.
This commit is contained in:
Dmitrij D. Czarkoff 2016-01-11 19:03:40 +01:00 committed by wm4
parent 0915a8497b
commit ea442fa047
84 changed files with 83 additions and 83 deletions

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -26,7 +26,7 @@
#include <stdlib.h>
#include <math.h>
#include "talloc.h"
#include "mpv_talloc.h"
#include "config.h"
#include "osdep/timer.h"

View File

@ -27,7 +27,7 @@
#include <libavutil/common.h>
#include "talloc.h"
#include "mpv_talloc.h"
#include "options/m_option.h"
#include "audio/format.h"

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -23,7 +23,7 @@
#include <inttypes.h>
#include <math.h>
#include "talloc.h"
#include "mpv_talloc.h"
#include "demux.h"
#include "timeline.h"

View File

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

View File

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

View File

@ -29,7 +29,7 @@
#include "osdep/io.h"
#include "talloc.h"
#include "mpv_talloc.h"
#include "common/msg.h"
#include "common/global.h"

View File

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

View File

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

View File

@ -24,7 +24,7 @@
#include <libavutil/common.h>
#include "talloc.h"
#include "mpv_talloc.h"
#include "common/common.h"
#include "misc/ctype.h"

View File

@ -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

View File

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

View File

@ -30,7 +30,7 @@
#include "libmpv/client.h"
#include "talloc.h"
#include "mpv_talloc.h"
#include "m_config.h"
#include "options/m_option.h"

View File

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

View File

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

View File

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

View File

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

View File

@ -23,7 +23,7 @@
#include <errno.h>
#include <assert.h>
#include "talloc.h"
#include "mpv_talloc.h"
#include "config.h"
#include "osdep/io.h"

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -25,7 +25,7 @@
#include <libavutil/md5.h>
#include "config.h"
#include "talloc.h"
#include "mpv_talloc.h"
#include "osdep/io.h"

View File

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

View File

@ -30,7 +30,7 @@
#include "osdep/io.h"
#include "talloc.h"
#include "mpv_talloc.h"
#include "common/common.h"
#include "options/m_property.h"

View File

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

View File

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

View File

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

View File

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

View File

@ -23,7 +23,7 @@
#include "osdep/io.h"
#include "talloc.h"
#include "mpv_talloc.h"
#include "screenshot.h"
#include "core.h"
#include "command.h"

View File

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

View File

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

View File

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

View File

@ -29,7 +29,7 @@
#include "osdep/atomics.h"
#include "osdep/io.h"
#include "talloc.h"
#include "mpv_talloc.h"
#include "config.h"

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -3,7 +3,7 @@
#include <string.h>
#include <inttypes.h>
#include "talloc.h"
#include "mpv_talloc.h"
#include "options/m_option.h"

View File

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

View File

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

View File

@ -24,7 +24,7 @@
#include <libavutil/buffer.h>
#include "talloc.h"
#include "mpv_talloc.h"
#include "common/common.h"
#include "video/mp_image.h"

View File

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

View File

@ -45,7 +45,7 @@
#include "win_state.h"
#include "input/input.h"
#include "talloc.h"
#include "mpv_talloc.h"
#include "common/msg.h"

View File

@ -35,7 +35,7 @@
#include <libavutil/lfg.h>
#include "talloc.h"
#include "mpv_talloc.h"
#include "dither.h"
#define MAX_SIZEB 8

View File

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

View File

@ -28,7 +28,7 @@
#include <poll.h>
#endif
#include "talloc.h"
#include "mpv_talloc.h"
#include "config.h"
#include "osdep/timer.h"

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

@ -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.

View File

@ -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>