From ea442fa047819ec2e48a3dbe8ea21959ac3d70b0 Mon Sep 17 00:00:00 2001
From: "Dmitrij D. Czarkoff" <czarkoff@gmail.com>
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.
---
 audio/out/ao_null.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'audio/out/ao_null.c')

diff --git a/audio/out/ao_null.c b/audio/out/ao_null.c
index 0af0a97b96..7d45795d9e 100644
--- a/audio/out/ao_null.c
+++ b/audio/out/ao_null.c
@@ -26,7 +26,7 @@
 #include <stdlib.h>
 #include <math.h>
 
-#include "talloc.h"
+#include "mpv_talloc.h"
 
 #include "config.h"
 #include "osdep/timer.h"
-- 
cgit v1.2.3