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/ad.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/ad.c')
| -rw-r--r-- | libmpcodecs/ad.c | 16 |
1 files changed, 0 insertions, 16 deletions
diff --git a/libmpcodecs/ad.c b/libmpcodecs/ad.c index 0ab5d44971..dce8f9f710 100644 --- a/libmpcodecs/ad.c +++ b/libmpcodecs/ad.c @@ -41,20 +41,14 @@ extern const ad_functions_t mpcodecs_ad_dvdpcm; extern const ad_functions_t mpcodecs_ad_alaw; extern const ad_functions_t mpcodecs_ad_imaadpcm; extern const ad_functions_t mpcodecs_ad_msadpcm; -extern const ad_functions_t mpcodecs_ad_dk3adpcm; -extern const ad_functions_t mpcodecs_ad_dk4adpcm; extern const ad_functions_t mpcodecs_ad_dshow; extern const ad_functions_t mpcodecs_ad_dmo; extern const ad_functions_t mpcodecs_ad_acm; extern const ad_functions_t mpcodecs_ad_faad; -extern const ad_functions_t mpcodecs_ad_libvorbis; -extern const ad_functions_t mpcodecs_ad_speex; extern const ad_functions_t mpcodecs_ad_libmad; extern const ad_functions_t mpcodecs_ad_realaud; extern const ad_functions_t mpcodecs_ad_libdv; extern const ad_functions_t mpcodecs_ad_qtaudio; -extern const ad_functions_t mpcodecs_ad_twin; -extern const ad_functions_t mpcodecs_ad_libmusepack; extern const ad_functions_t mpcodecs_ad_libdca; const ad_functions_t * const mpcodecs_ad_drivers[] = @@ -73,7 +67,6 @@ const ad_functions_t * const mpcodecs_ad_drivers[] = &mpcodecs_ad_alaw, &mpcodecs_ad_imaadpcm, &mpcodecs_ad_msadpcm, - &mpcodecs_ad_dk3adpcm, #ifdef CONFIG_WIN32DLL &mpcodecs_ad_dshow, &mpcodecs_ad_dmo, @@ -86,12 +79,6 @@ const ad_functions_t * const mpcodecs_ad_drivers[] = #ifdef CONFIG_FAAD &mpcodecs_ad_faad, #endif -#ifdef CONFIG_OGGVORBIS - &mpcodecs_ad_libvorbis, -#endif -#ifdef CONFIG_SPEEX - &mpcodecs_ad_speex, -#endif #ifdef CONFIG_LIBMAD &mpcodecs_ad_libmad, #endif @@ -101,9 +88,6 @@ const ad_functions_t * const mpcodecs_ad_drivers[] = #ifdef CONFIG_LIBDV095 &mpcodecs_ad_libdv, #endif -#ifdef CONFIG_MUSEPACK - &mpcodecs_ad_libmusepack, -#endif #ifdef CONFIG_LIBDCA &mpcodecs_ad_libdca, #endif |