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 /libmpcodecs/vd.c | |
| 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 'libmpcodecs/vd.c')
| -rw-r--r-- | libmpcodecs/vd.c | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/libmpcodecs/vd.c b/libmpcodecs/vd.c index c01796ac78..e7a497009a 100644 --- a/libmpcodecs/vd.c +++ b/libmpcodecs/vd.c @@ -39,7 +39,6 @@ extern const vd_functions_t mpcodecs_vd_null; extern const vd_functions_t mpcodecs_vd_ffmpeg; -extern const vd_functions_t mpcodecs_vd_theora; extern const vd_functions_t mpcodecs_vd_dshow; extern const vd_functions_t mpcodecs_vd_dmo; extern const vd_functions_t mpcodecs_vd_vfw; @@ -50,10 +49,7 @@ extern const vd_functions_t mpcodecs_vd_xanim; extern const vd_functions_t mpcodecs_vd_mpng; extern const vd_functions_t mpcodecs_vd_ijpg; extern const vd_functions_t mpcodecs_vd_mtga; -extern const vd_functions_t mpcodecs_vd_sgi; -extern const vd_functions_t mpcodecs_vd_mpegpes; extern const vd_functions_t mpcodecs_vd_realvid; -extern const vd_functions_t mpcodecs_vd_xvid; extern const vd_functions_t mpcodecs_vd_libdv; extern const vd_functions_t mpcodecs_vd_lzo; extern const vd_functions_t mpcodecs_vd_qtvideo; @@ -65,9 +61,6 @@ extern const vd_functions_t mpcodecs_vd_qtvideo; const vd_functions_t * const mpcodecs_vd_drivers[] = { &mpcodecs_vd_null, &mpcodecs_vd_ffmpeg, -#ifdef CONFIG_OGGTHEORA - &mpcodecs_vd_theora, -#endif #ifdef CONFIG_WIN32DLL &mpcodecs_vd_dshow, &mpcodecs_vd_dmo, @@ -87,14 +80,9 @@ const vd_functions_t * const mpcodecs_vd_drivers[] = { &mpcodecs_vd_ijpg, #endif &mpcodecs_vd_mtga, - &mpcodecs_vd_sgi, - &mpcodecs_vd_mpegpes, #ifdef CONFIG_REALCODECS &mpcodecs_vd_realvid, #endif -#ifdef CONFIG_XVID4 - &mpcodecs_vd_xvid, -#endif #ifdef CONFIG_LIBDV095 &mpcodecs_vd_libdv, #endif |