summaryrefslogtreecommitdiffstats
path: root/demux/demux_mf.c
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 /demux/demux_mf.c
parenteb15151705d47d23da844449126cc6b4879f110e (diff)
downloadmpv-73a5417950a2d21a397597c05521725f3d125993.tar.bz2
mpv-73a5417950a2d21a397597c05521725f3d125993.tar.xz
Merge mp_talloc.h into ta/ta_talloc.h
Diffstat (limited to 'demux/demux_mf.c')
-rw-r--r--demux/demux_mf.c1
1 files changed, 0 insertions, 1 deletions
diff --git a/demux/demux_mf.c b/demux/demux_mf.c
index fbcf3da961..1eea59a058 100644
--- a/demux/demux_mf.c
+++ b/demux/demux_mf.c
@@ -28,7 +28,6 @@
#include "talloc.h"
#include "config.h"
#include "mpvcore/mp_msg.h"
-#include "mpvcore/mp_talloc.h"
#include "stream/stream.h"
#include "demux.h"