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. --- core/options.h | 1 + 1 file changed, 1 insertion(+) (limited to 'core/options.h') diff --git a/core/options.h b/core/options.h index 1eb111e33e..f7be4adb02 100644 --- a/core/options.h +++ b/core/options.h @@ -160,6 +160,7 @@ typedef struct MPOpts { char *screenshot_template; double force_fps; + int index_mode; // -1=untouched 0=don't use index 1=use (generate) index struct mp_chmap audio_output_channels; int audio_output_format; -- cgit v1.2.3 From 9bb7935ce186d55aaaafd708e7559345082ecabc Mon Sep 17 00:00:00 2001 From: wm4 Date: Mon, 8 Jul 2013 21:59:44 +0200 Subject: options: remove --ignore-start This was used only with demux_avi. --- core/options.h | 1 - 1 file changed, 1 deletion(-) (limited to 'core/options.h') diff --git a/core/options.h b/core/options.h index f7be4adb02..d46435bf9e 100644 --- a/core/options.h +++ b/core/options.h @@ -105,7 +105,6 @@ typedef struct MPOpts { float hr_seek_demuxer_offset; float audio_delay; float default_max_pts_correction; - int ignore_start; int autosync; int softsleep; int frame_dropping; -- 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. --- core/options.h | 1 - 1 file changed, 1 deletion(-) (limited to 'core/options.h') diff --git a/core/options.h b/core/options.h index d46435bf9e..345835656b 100644 --- a/core/options.h +++ b/core/options.h @@ -152,7 +152,6 @@ typedef struct MPOpts { char *demuxer_name; char *audio_demuxer_name; char *sub_demuxer_name; - int extension_parsing; int mkv_subtitle_preroll; struct image_writer_opts *screenshot_image_opts; -- cgit v1.2.3