summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2013-12-17 02:18:16 +0100
committerwm4 <wm4@nowhere>2013-12-17 02:18:16 +0100
commit73a5417950a2d21a397597c05521725f3d125993 (patch)
tree46fc5856d7774a39d449bbbd80405d0d2ba92fd9 /stream
parenteb15151705d47d23da844449126cc6b4879f110e (diff)
downloadmpv-73a5417950a2d21a397597c05521725f3d125993.tar.bz2
mpv-73a5417950a2d21a397597c05521725f3d125993.tar.xz
Merge mp_talloc.h into ta/ta_talloc.h
Diffstat (limited to 'stream')
-rw-r--r--stream/rar.c2
-rw-r--r--stream/stream_lavf.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/stream/rar.c b/stream/rar.c
index 4147a86866..00c5c16725 100644
--- a/stream/rar.c
+++ b/stream/rar.c
@@ -31,8 +31,8 @@
#include <libavutil/intreadwrite.h>
+#include "talloc.h"
#include "mpvcore/mp_common.h"
-#include "mpvcore/mp_talloc.h"
#include "stream.h"
#include "rar.h"
diff --git a/stream/stream_lavf.c b/stream/stream_lavf.c
index 8f82aedf05..d3aaf52d85 100644
--- a/stream/stream_lavf.c
+++ b/stream/stream_lavf.c
@@ -29,7 +29,7 @@
#include "cookies.h"
#include "mpvcore/bstr.h"
-#include "mpvcore/mp_talloc.h"
+#include "talloc.h"
static int open_f(stream_t *stream, int mode);
static char **read_icy(stream_t *stream);