From ea442fa047819ec2e48a3dbe8ea21959ac3d70b0 Mon Sep 17 00:00:00 2001 From: "Dmitrij D. Czarkoff" Date: Mon, 11 Jan 2016 19:03:40 +0100 Subject: mpv_talloc.h: rename from talloc.h This change helps avoiding conflict with talloc.h from libtalloc. --- video/decode/vd_lavc.c | 2 +- video/filter/vf_buffer.c | 2 +- video/image_writer.c | 2 +- video/mp_image.c | 2 +- video/mp_image_pool.c | 2 +- video/out/bitmap_packer.c | 2 +- video/out/cocoa_common.m | 2 +- video/out/dither.c | 2 +- video/out/opengl/lcms.c | 2 +- video/out/vo.c | 2 +- video/out/vo_direct3d.c | 2 +- video/out/vo_image.c | 2 +- video/out/vo_lavc.c | 2 +- video/out/vo_opengl.c | 2 +- video/out/vo_opengl_cb.c | 2 +- video/out/vo_vdpau.c | 2 +- video/out/vo_xv.c | 2 +- video/out/w32_common.c | 2 +- video/out/wayland_common.c | 2 +- video/out/win32/displayconfig.c | 2 +- video/out/x11_common.c | 2 +- 21 files changed, 21 insertions(+), 21 deletions(-) (limited to 'video') 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 #include -#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 #include -#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 #include -#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 -#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 -#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 -#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 -#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 #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 #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 #include -- cgit v1.2.3