From ea442fa047819ec2e48a3dbe8ea21959ac3d70b0 Mon Sep 17 00:00:00 2001 From: "Dmitrij D. Czarkoff" 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_pool.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'video/mp_image_pool.c') diff --git a/video/mp_image_pool.c b/video/mp_image_pool.c index 5992c631f9..6c289f3edf 100644 --- a/video/mp_image_pool.c +++ b/video/mp_image_pool.c @@ -24,7 +24,7 @@ #include -#include "talloc.h" +#include "mpv_talloc.h" #include "common/common.h" #include "video/mp_image.h" -- cgit v1.2.3