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.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'sub/osd.c') diff --git a/sub/osd.c b/sub/osd.c index ba4011c040..63d6136b9f 100644 --- a/sub/osd.c +++ b/sub/osd.c @@ -28,7 +28,7 @@ #include "osdep/timer.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "options/options.h" #include "common/global.h" #include "common/msg.h" -- cgit v1.2.3