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

(limited to 'misc/ring.c')

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