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_dummy.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sub/osd_dummy.c') diff --git a/sub/osd_dummy.c b/sub/osd_dummy.c index 5a33321d07..5c50569dd6 100644 --- a/sub/osd_dummy.c +++ b/sub/osd_dummy.c @@ -3,7 +3,7 @@ #include #include "config.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "osd.h" const char *const osd_ass_0 = ""; -- cgit v1.2.3