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

(limited to 'demux/demux_edl.c')

diff --git a/demux/demux_edl.c b/demux/demux_edl.c
index 9ba0307487..74ce7aef66 100644
--- a/demux/demux_edl.c
+++ b/demux/demux_edl.c
@@ -23,7 +23,7 @@
 #include <inttypes.h>
 #include <math.h>
 
-#include "talloc.h"
+#include "mpv_talloc.h"
 
 #include "demux.h"
 #include "timeline.h"
-- 
cgit v1.2.3