From ae9c3d530c55e86eb54d8cf23a23c5ce6301ec6e Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 7 Sep 2012 14:42:25 +0200 Subject: 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. --- Makefile | 1 + 1 file changed, 1 insertion(+) (limited to 'Makefile') 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 \ -- cgit v1.2.3