diff options
| -rwxr-xr-x | configure | 18 | ||||
| -rw-r--r-- | libmpdemux/Makefile | 4 | ||||
| -rw-r--r-- | libmpdemux/demux_mkv.c | 3 | ||||
| -rw-r--r-- | libmpdemux/demuxer.c | 2 | ||||
| -rw-r--r-- | libmpdemux/ebml.c | 3 |
5 files changed, 1 insertions, 29 deletions
@@ -279,7 +279,6 @@ Codecs: --disable-vorbis disable OggVorbis support entirely [autodetect] --disable-speex disable Speex support [autodetect] --enable-theora build with OggTheora support [autodetect] - --disable-internal-matroska disable internal Matroska support [enabled] --enable-external-faad build with external FAAD2 (AAC) support [autodetect] --disable-internal-faad disable internal FAAD2 (AAC) support [autodetect] --disable-faac disable support for FAAC (AAC encoder) [autodetect] @@ -1578,7 +1577,6 @@ _mp3lib=yes _liba52=yes _libdts=auto _libmpeg2=yes -_matroska_internal=yes _tremor=no _faad_internal=auto _faad_external=auto @@ -1793,8 +1791,6 @@ for ac_option do --disable-libmpeg2) _libmpeg2=no ;; --enable-musepack) _musepack=yes ;; --disable-musepack) _musepack=no ;; - --enable-internal-matroska) _matroska_internal=yes ;; - --disable-internal-matroska) _matroska_internal=no ;; --enable-internal-faad) _faad_internal=yes _faad_external=no ;; --disable-internal-faad) _faad_internal=no ;; --enable-external-faad) _faad_external=yes _faad_internal=no ;; @@ -5715,16 +5711,6 @@ fi echores "$_musepack" -echocheck "Matroska support" -if test "$_matroska_internal" = yes ; then - _inputmodules="matroska $_inputmodules" - _def_matroska='#define HAVE_MATROSKA 1' -else - _noinputmodules="matroska $_noinputmodules" - _def_matroska='#undef HAVE_MATROSKA' -fi -echores "$_matroska_internal" - echocheck "FAAC (AAC encoder) support" if test "$_faac" = auto ; then cat > $TMPC <<EOF @@ -7326,7 +7312,6 @@ EXTERNAL_VIDIX_LIB = $_ld_vidix_external CONFIG_PP = yes CONFIG_MP3LAME = $_mp3lame LIBMENU = $_menu -MATROSKA = $_matroska_internal OPENDIVX = $_opendivx @@ -8069,9 +8054,6 @@ $_def_musepack /* enable OggTheora support */ $_def_theora -/* enable Matroska support */ -$_def_matroska - /* enable FAAD (AAC) support */ $_def_faad $_def_faad_internal diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile index a70710b598..e07d747325 100644 --- a/libmpdemux/Makefile +++ b/libmpdemux/Makefile @@ -86,6 +86,7 @@ SRCS += demuxer.c \ demux_viv.c \ demux_vqf.c \ demux_y4m.c \ + demux_mkv.c ebml.c \ ifeq ($(HAVE_DVD),yes) SRCS += stream_dvd.c @@ -96,9 +97,6 @@ endif ifneq ($(W32_LIB),) SRCS += demux_avs.c endif -ifeq ($(MATROSKA),yes) -SRCS += demux_mkv.c ebml.c -endif # Muxers MUXERS = muxer.c \ diff --git a/libmpdemux/demux_mkv.c b/libmpdemux/demux_mkv.c index 564e15803d..7fa484714f 100644 --- a/libmpdemux/demux_mkv.c +++ b/libmpdemux/demux_mkv.c @@ -7,7 +7,6 @@ */ #include "config.h" -#ifdef HAVE_MATROSKA #include <stdlib.h> #include <stdio.h> @@ -3618,5 +3617,3 @@ demuxer_desc_t demuxer_desc_matroska = { demux_mkv_seek, demux_mkv_control }; - -#endif /* HAVE_MATROSKA */ diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c index 35553ce490..a95b453e87 100644 --- a/libmpdemux/demuxer.c +++ b/libmpdemux/demuxer.c @@ -81,9 +81,7 @@ demuxer_desc_t* demuxer_list[] = { &demuxer_desc_nuv, &demuxer_desc_real, &demuxer_desc_smjpeg, -#ifdef HAVE_MATROSKA &demuxer_desc_matroska, -#endif &demuxer_desc_realaudio, &demuxer_desc_vqf, &demuxer_desc_mov, diff --git a/libmpdemux/ebml.c b/libmpdemux/ebml.c index 89da629288..2e5d5a8164 100644 --- a/libmpdemux/ebml.c +++ b/libmpdemux/ebml.c @@ -6,7 +6,6 @@ */ #include "config.h" -#ifdef HAVE_MATROSKA #include <stdlib.h> @@ -363,5 +362,3 @@ ebml_read_header (stream_t *s, int *version) return str; } - -#endif /* HAVE_MATROSKA */ |