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. --- player/sub.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'player/sub.c') diff --git a/player/sub.c b/player/sub.c index dd1ba6d384..5f2f13e88f 100644 --- a/player/sub.c +++ b/player/sub.c @@ -22,7 +22,7 @@ #include #include "config.h" -#include "talloc.h" +#include "mpv_talloc.h" #include "common/msg.h" #include "options/options.h" -- cgit v1.2.3