summaryrefslogtreecommitdiffstats
path: root/Makefile
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-09-07 14:42:25 +0200
committerwm4 <wm4@nowhere>2012-09-18 21:07:30 +0200
commitae9c3d530c55e86eb54d8cf23a23c5ce6301ec6e (patch)
tree20f50ce7713ffa7d671a86fc43b709354ae8991a /Makefile
parentc323592c3ac8557e09b8235bd43196f968e91168 (diff)
downloadmpv-ae9c3d530c55e86eb54d8cf23a23c5ce6301ec6e.tar.bz2
mpv-ae9c3d530c55e86eb54d8cf23a23c5ce6301ec6e.tar.xz
libmpdemux: add back demux_ts
Someone wanted this. Apparently both libavformat's TS demuxer and demux_ts are crap, and work/fail in different cases. This demuxer has been removed in 1fde09db6f4ce. All code added comes from the revision before that. Some required bits have been added in the commit before this one (re-adding demux_mpg), in particular the changes to video.c. stream_dvb will use this demuxer by default, otherwise demux_lavf is preferred (as it has been before). Some TS related command line options are not re-added. Closed captions might not work.
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile1
1 files changed, 1 insertions, 0 deletions
diff --git a/Makefile b/Makefile
index 34e4bdef8f..863eeb4b85 100644
--- a/Makefile
+++ b/Makefile
@@ -235,6 +235,7 @@ SRCS_COMMON = asxparser.c \
libmpdemux/demux_mf.c \
libmpdemux/demux_mkv.c \
libmpdemux/demux_mpg.c \
+ libmpdemux/demux_ts.c \
libmpdemux/mp3_hdr.c \
libmpdemux/parse_es.c \
libmpdemux/mpeg_hdr.c \