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. --- sub/osd_libass.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sub/osd_libass.c') diff --git a/sub/osd_libass.c b/sub/osd_libass.c index 6bb125723b..0c24483e32 100644 --- a/sub/osd_libass.c +++ b/sub/osd_libass.c @@ -24,7 +24,7 @@ #include "config.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "misc/bstr.h" #include "common/common.h" #include "common/msg.h" -- cgit v1.2.3