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. --- Makefile | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 7dc01f7a3d..55ea165e1c 100644 --- a/Makefile +++ b/Makefile @@ -185,24 +185,14 @@ SOURCES = talloc.c \ core/timeline/tl_edl.c \ core/timeline/tl_matroska.c \ core/timeline/tl_cue.c \ - demux/asfheader.c \ - demux/aviheader.c \ - demux/aviprint.c \ demux/codec_tags.c \ demux/demux.c \ - demux/demux_asf.c \ - demux/demux_avi.c \ demux/demux_edl.c \ demux/demux_cue.c \ demux/demux_lavf.c \ demux/demux_mf.c \ demux/demux_mkv.c \ - demux/demux_mpg.c \ demux/demux_subreader.c \ - demux/demux_ts.c \ - demux/mp3_hdr.c \ - demux/parse_es.c \ - demux/mpeg_hdr.c \ demux/demux_rawaudio.c \ demux/demux_rawvideo.c \ demux/ebml.c \ -- cgit v1.2.3 From 186f6021b1aebd84dbb625d8747d5edaaf87dd38 Mon Sep 17 00:00:00 2001 From: wm4 Date: Wed, 10 Jul 2013 02:07:26 +0200 Subject: core: move code from demux/video.c to mplayer.c Although I don't like putting even more crap into mplayer.c, this is a bit better, especially with coming cleanups in mind. --- Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 55ea165e1c..3e0af2d55e 100644 --- a/Makefile +++ b/Makefile @@ -198,7 +198,6 @@ SOURCES = talloc.c \ demux/ebml.c \ demux/extension.c \ demux/mf.c \ - demux/video.c \ osdep/io.c \ osdep/numcores.c \ osdep/timer.c \ -- cgit v1.2.3 From 3269bd178020c5d821e8b2d1fd807a38d63e93ce Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 12 Jul 2013 21:58:11 +0200 Subject: demux: rewrite probing and demuxer initialization Get rid of the strange and messy reliance on DEMUXER_TYPE_ constants. Instead of having two open functions for the demuxer callbacks (which somehow are both optional, but you can also decide to implement both...), just have one function. This function takes a parameter that tells the demuxer how strictly it should check for the file headers. This is a nice simplification and allows more flexibility. Remove the file extension code. This literally did nothing (anymore). Change demux_lavf so that we check our other builtin demuxers first before libavformat tries to guess by file extension. --- Makefile | 1 - 1 file changed, 1 deletion(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index 3e0af2d55e..a1de600dcc 100644 --- a/Makefile +++ b/Makefile @@ -196,7 +196,6 @@ SOURCES = talloc.c \ demux/demux_rawaudio.c \ demux/demux_rawvideo.c \ demux/ebml.c \ - demux/extension.c \ demux/mf.c \ osdep/io.c \ osdep/numcores.c \ -- cgit v1.2.3 From cfa571253a6f7ac49736e2d0042c120571ddf2a2 Mon Sep 17 00:00:00 2001 From: wm4 Date: Fri, 12 Jul 2013 22:52:10 +0200 Subject: demux_rawvideo/demux_rawaudio: move both demuxers to demux_raw.c This allows them to share some trivial code. Both demuxers are still separate from user perspective. --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index a1de600dcc..ad4728270c 100644 --- a/Makefile +++ b/Makefile @@ -193,8 +193,7 @@ SOURCES = talloc.c \ demux/demux_mf.c \ demux/demux_mkv.c \ demux/demux_subreader.c \ - demux/demux_rawaudio.c \ - demux/demux_rawvideo.c \ + demux/demux_raw.c \ demux/ebml.c \ demux/mf.c \ osdep/io.c \ -- cgit v1.2.3