diff options
| author | wm4 <wm4@nowhere> | 2012-07-30 18:40:46 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-07-30 22:14:32 +0200 |
| commit | 1fde09db6f4cee7347842261234082470dd3a2ca (patch) | |
| tree | c05bf64b1b397a62e6f0b9cf295a6f9d0266eed2 /cfg-mplayer.h | |
| parent | 17b69493b70413326c95c3c552009626809b45ec (diff) | |
| download | mpv-1fde09db6f4cee7347842261234082470dd3a2ca.tar.bz2 mpv-1fde09db6f4cee7347842261234082470dd3a2ca.tar.xz | |
Remove some demuxers and decoders
Most of these demuxers and decoders are provided in better form by
libav, while the mplayer builtin ones are essentially unmaintained. The
only legimitate use case for not using the libav ones was working around
libav bugs or bugs related to the way mplayer uses libav. Instead of
trying to keep dead code alive, development effort should go into
improving libav or the mplayer libav glue code.
Note that the libav demuxer have been preferred over the mplayer builtin
ones for a while in mplayer2. There were some exceptions: playing DVDs
with dvdnav or playing network sources. (That's because some stream
modules and network.c requested explicit file formats, such as
DEMUXER_TYPE_MPEG_PS, which mapped to builtin demuxers.) With this
commit, they are switched to use libav. One caveat is that the requested
format is not passed to libavformat, instead we rely on the auto probing
to select the correct libav demuxer (see code in demux_open_stream()).
Diffstat (limited to 'cfg-mplayer.h')
| -rw-r--r-- | cfg-mplayer.h | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 489419d941..8dc026a00d 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -30,7 +30,6 @@ #include "config.h" #include "m_config.h" #include "m_option.h" -#include "libmpdemux/demux_ts.h" #include "stream/tv.h" #include "stream/stream_radio.h" #include "libvo/csputils.h" @@ -77,12 +76,6 @@ extern const m_option_t demux_rawaudio_opts[]; extern const m_option_t demux_rawvideo_opts[]; extern const m_option_t cdda_opts[]; -extern int ts_prog; -extern int ts_keep_broken; -extern off_t ts_probe; -extern int audio_substream_id; -extern off_t ps_probe; - extern int sws_flags; extern const char pp_help[]; @@ -465,7 +458,6 @@ const m_option_t common_opts[] = { // select audio/video/subtitle stream OPT_INTRANGE("aid", audio_id, 0, -2, 8190), - {"ausid", &audio_substream_id, CONF_TYPE_INT, 0, 0, 0, NULL}, OPT_INTRANGE("vid", video_id, 0, -2, 8190), OPT_INTRANGE("sid", sub_id, 0, -2, 8190), OPT_FLAG_CONSTANTS("no-sub", sub_id, 0, -1, -2), @@ -566,10 +558,6 @@ const m_option_t common_opts[] = { OPT_FLAG_CONSTANTS("flip", flip, 0, -1, 1), OPT_FLAG_CONSTANTS("no-flip", flip, 0, -1, 0), - {"tsprog", &ts_prog, CONF_TYPE_INT, CONF_RANGE, 0, 65534, NULL}, - {"tsprobe", &ts_probe, CONF_TYPE_POSITION, 0, 0, TS_MAX_PROBE_SIZE, NULL}, - {"psprobe", &ps_probe, CONF_TYPE_POSITION, 0, 0, TS_MAX_PROBE_SIZE, NULL}, - {"tskeepbroken", &ts_keep_broken, CONF_TYPE_FLAG, 0, 0, 1, NULL}, // draw by slices or whole frame (useful with libmpeg2/libavcodec) OPT_MAKE_FLAGS("slices", vd_use_slices, 0), |