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/image_writer.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'video/image_writer.c') diff --git a/video/image_writer.c b/video/image_writer.c index 50dc42aff5..4ea7c0c1df 100644 --- a/video/image_writer.c +++ b/video/image_writer.c @@ -32,7 +32,7 @@ #include "osdep/io.h" #include "image_writer.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "video/img_format.h" #include "video/mp_image.h" #include "video/fmt-conversion.h" -- cgit v1.2.3