From af0c41e162725b0edcd6c3d066a2dbef05a3b896 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 7 Jul 2013 23:54:11 +0200 Subject: Remove old demuxers Delete demux_avi, demux_asf, demux_mpg, demux_ts. libavformat does better than them (except in rare corner cases), and the demuxers have a bad influence on the rest of the code. Often they don't output proper packets, and require additional audio and video parsing. Most work only in --no-correct-pts mode. Remove them to facilitate further cleanups. --- stream/stream_dvb.c | 2 +- stream/stream_vcd.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'stream') diff --git a/stream/stream_dvb.c b/stream/stream_dvb.c index 40c27f9aac..77c0523eb2 100644 --- a/stream/stream_dvb.c +++ b/stream/stream_dvb.c @@ -739,7 +739,7 @@ static int dvb_open(stream_t *stream, int mode, void *opts, int *file_format) stream->close = dvbin_close; m_struct_free(&stream_opts, opts); - *file_format = DEMUXER_TYPE_MPEG_TS; + *file_format = DEMUXER_TYPE_LAVF; // TS return STREAM_OK; } diff --git a/stream/stream_vcd.c b/stream/stream_vcd.c index 87b03f6e40..a459d6c880 100644 --- a/stream/stream_vcd.c +++ b/stream/stream_vcd.c @@ -232,7 +232,7 @@ static int open_s(stream_t *stream,int mode, void* opts, int* file_format) { stream->seek = seek; stream->control = control; stream->close = close_s; - *file_format = DEMUXER_TYPE_MPEG_PS; + *file_format = DEMUXER_TYPE_LAVF; // mpegps m_struct_free(&stream_opts,opts); return STREAM_OK; -- cgit v1.2.3