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.
---
 common/common.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'common/common.c')

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