From ea442fa047819ec2e48a3dbe8ea21959ac3d70b0 Mon Sep 17 00:00:00 2001
From: "Dmitrij D. Czarkoff" <czarkoff@gmail.com>
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/out/w32_common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'video/out/w32_common.c')

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";
 
-- 
cgit v1.2.3