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. --- DOCS/man/en/changes.rst | 1 - DOCS/man/en/options.rst | 10 ---------- 2 files changed, 11 deletions(-) (limited to 'DOCS/man/en') diff --git a/DOCS/man/en/changes.rst b/DOCS/man/en/changes.rst index e6a20b6ddf..494c46e186 100644 --- a/DOCS/man/en/changes.rst +++ b/DOCS/man/en/changes.rst @@ -106,7 +106,6 @@ Command Line Switches -subdelay --sub-delay -subpos --sub-pos -forcedsubsonly --sub-forced-only - -ni --avi-ni -benchmark --untimed (no stats) -xineramascreen --screen (different values) -ss --start diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index 938e5d54ed..9c7aac61ce 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -1198,20 +1198,10 @@ depends on the VO backend and how it handles keyboard input. Does not apply to terminal input.) ---avi-ni - (Internal AVI demuxer which is not used by default only) - Force usage of non-interleaved AVI parser (fixes playback of some bad AVI - files). - --no-aspect Ignore aspect ratio information from video file and assume the video has square pixels. See also ``--aspect``. ---no-bps - (Internal AVI demuxer which is not used by default only) - Do not use average byte/second value for A-V sync. Helps with some AVI - files with broken header. - --no-cache Turn off input stream caching. See ``--cache``. -- 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. --- DOCS/man/en/options.rst | 5 ----- 1 file changed, 5 deletions(-) (limited to 'DOCS/man/en') diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index 915602aaca..d891766f6b 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -1044,11 +1044,6 @@ This option only works if the underlying media supports seeking (i.e. not with stdin, pipe, etc). -``--ignore-start`` - Matters with the builtin AVI demuxer only, which is not enabled by default. - Ignore the specified starting time for streams in AVI files. This - nullifies stream delays. - ``--include=`` Specify configuration file to be parsed after the default ones. -- 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. --- DOCS/man/en/options.rst | 6 ------ 1 file changed, 6 deletions(-) (limited to 'DOCS/man/en') diff --git a/DOCS/man/en/options.rst b/DOCS/man/en/options.rst index d891766f6b..a6e5fee7ed 100644 --- a/DOCS/man/en/options.rst +++ b/DOCS/man/en/options.rst @@ -690,12 +690,6 @@ Stop at given absolute time. Use ``--length`` if the time should be relative to ``--start``. See ``--start`` for valid option values and examples. -``--no-extbased``, ``--extbased`` - ``--no-extbased`` disables extension-based demuxer selection. By default, - when the file type (demuxer) cannot be detected reliably (the file has no - header or it is not reliable enough), the filename extension is used to - select the demuxer. Always falls back on content-based demuxer selection. - ``--field-dominance=`` Set first field for interlaced content. Useful for deinterlacers that double the framerate: ``--vf=yadif=1`` and ``--vo=vdpau:deint``. -- cgit v1.2.3