summaryrefslogtreecommitdiffstats
path: root/input/input.c
diff options
context:
space:
mode:
authorDmitrij D. Czarkoff <czarkoff@gmail.com>2016-01-11 19:03:40 +0100
committerwm4 <wm4@nowhere>2016-01-11 21:05:55 +0100
commitea442fa047819ec2e48a3dbe8ea21959ac3d70b0 (patch)
tree7eee2d4734a8bc8de35a9e6dd74d75051df64380 /input/input.c
parent0915a8497b12a7b526e0e8eae322eb8deb31eace (diff)
downloadmpv-ea442fa047819ec2e48a3dbe8ea21959ac3d70b0.tar.bz2
mpv-ea442fa047819ec2e48a3dbe8ea21959ac3d70b0.tar.xz
mpv_talloc.h: rename from talloc.h
This change helps avoiding conflict with talloc.h from libtalloc.
Diffstat (limited to 'input/input.c')
-rw-r--r--input/input.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/input/input.c b/input/input.c
index 2e7d6d30ef..d1c69a9587 100644
--- a/input/input.c
+++ b/input/input.c
@@ -48,7 +48,7 @@
#include "options/m_config.h"
#include "options/m_option.h"
#include "options/path.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "options/options.h"
#include "misc/bstr.h"
#include "stream/stream.h"