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

(limited to 'video/mp_image.c')

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 <libavutil/rational.h>
 #include <libavcodec/avcodec.h>
 
-#include "talloc.h"
+#include "mpv_talloc.h"
 
 #include "img_format.h"
 #include "mp_image.h"
-- 
cgit v1.2.3