summaryrefslogtreecommitdiffstats
path: root/sub/osd_dummy.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 /sub/osd_dummy.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 'sub/osd_dummy.c')
-rw-r--r--sub/osd_dummy.c2
1 files changed, 1 insertions, 1 deletions
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 <string.h>
#include "config.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "osd.h"
const char *const osd_ass_0 = "";