summaryrefslogtreecommitdiffstats
path: root/demux
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 /demux
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 'demux')
-rw-r--r--demux/cue.c2
-rw-r--r--demux/demux.c2
-rw-r--r--demux/demux_cue.c2
-rw-r--r--demux/demux_edl.c2
-rw-r--r--demux/demux_mf.c2
-rw-r--r--demux/demux_mkv.c2
-rw-r--r--demux/demux_mkv_timeline.c2
-rw-r--r--demux/ebml.c2
8 files changed, 8 insertions, 8 deletions
diff --git a/demux/cue.c b/demux/cue.c
index 50ce4b7639..4a84107db7 100644
--- a/demux/cue.c
+++ b/demux/cue.c
@@ -20,7 +20,7 @@
#include <string.h>
#include <inttypes.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "misc/bstr.h"
#include "common/common.h"
diff --git a/demux/demux.c b/demux/demux.c
index d8a3030d33..b251674496 100644
--- a/demux/demux.c
+++ b/demux/demux.c
@@ -29,7 +29,7 @@
#include "config.h"
#include "options/options.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "common/msg.h"
#include "common/global.h"
#include "osdep/threads.h"
diff --git a/demux/demux_cue.c b/demux/demux_cue.c
index da84fc60c1..bef1516057 100644
--- a/demux/demux_cue.c
+++ b/demux/demux_cue.c
@@ -23,7 +23,7 @@
#include <dirent.h>
#include <inttypes.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "misc/bstr.h"
#include "common/msg.h"
diff --git a/demux/demux_edl.c b/demux/demux_edl.c
index 9ba0307487..74ce7aef66 100644
--- a/demux/demux_edl.c
+++ b/demux/demux_edl.c
@@ -23,7 +23,7 @@
#include <inttypes.h>
#include <math.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "demux.h"
#include "timeline.h"
diff --git a/demux/demux_mf.c b/demux/demux_mf.c
index 3f79c547f1..b41bf87aa3 100644
--- a/demux/demux_mf.c
+++ b/demux/demux_mf.c
@@ -24,7 +24,7 @@
#include "osdep/io.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "common/msg.h"
#include "options/options.h"
#include "options/path.h"
diff --git a/demux/demux_mkv.c b/demux/demux_mkv.c
index 7f32e8d810..3951452074 100644
--- a/demux/demux_mkv.c
+++ b/demux/demux_mkv.c
@@ -41,7 +41,7 @@
#include <zlib.h>
#endif
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "common/av_common.h"
#include "options/options.h"
#include "options/m_option.h"
diff --git a/demux/demux_mkv_timeline.c b/demux/demux_mkv_timeline.c
index f784f2d010..9212f6b39d 100644
--- a/demux/demux_mkv_timeline.c
+++ b/demux/demux_mkv_timeline.c
@@ -29,7 +29,7 @@
#include "osdep/io.h"
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "common/msg.h"
#include "common/global.h"
diff --git a/demux/ebml.c b/demux/ebml.c
index dbdc5e26ea..abbb73cfac 100644
--- a/demux/ebml.c
+++ b/demux/ebml.c
@@ -30,7 +30,7 @@
#include <libavutil/intfloat.h>
#include <libavutil/common.h>
-#include "talloc.h"
+#include "mpv_talloc.h"
#include "ebml.h"
#include "stream/stream.h"
#include "common/msg.h"