Mercurial > mplayer.hg
changeset 18404:e3379df74bcd
Unconditionally compile the Matroska demuxer.
| author | diego |
|---|---|
| date | Mon, 08 May 2006 21:41:15 +0000 |
| parents | 9bbc941f069e |
| children | 3c491f0bbb96 |
| files | configure libmpdemux/Makefile libmpdemux/demux_mkv.c libmpdemux/demuxer.c libmpdemux/ebml.c |
| diffstat | 5 files changed, 1 insertions(+), 29 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Mon May 08 21:12:59 2006 +0000 +++ b/configure Mon May 08 21:41:15 2006 +0000 @@ -279,7 +279,6 @@ --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 @@ _liba52=yes _libdts=auto _libmpeg2=yes -_matroska_internal=yes _tremor=no _faad_internal=auto _faad_external=auto @@ -1793,8 +1791,6 @@ --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 @@ 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 @@ CONFIG_PP = yes CONFIG_MP3LAME = $_mp3lame LIBMENU = $_menu -MATROSKA = $_matroska_internal OPENDIVX = $_opendivx @@ -8069,9 +8054,6 @@ /* enable OggTheora support */ $_def_theora -/* enable Matroska support */ -$_def_matroska - /* enable FAAD (AAC) support */ $_def_faad $_def_faad_internal
--- a/libmpdemux/Makefile Mon May 08 21:12:59 2006 +0000 +++ b/libmpdemux/Makefile Mon May 08 21:41:15 2006 +0000 @@ -86,6 +86,7 @@ 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 @@ ifneq ($(W32_LIB),) SRCS += demux_avs.c endif -ifeq ($(MATROSKA),yes) -SRCS += demux_mkv.c ebml.c -endif # Muxers MUXERS = muxer.c \
--- a/libmpdemux/demux_mkv.c Mon May 08 21:12:59 2006 +0000 +++ b/libmpdemux/demux_mkv.c Mon May 08 21:41:15 2006 +0000 @@ -7,7 +7,6 @@ */ #include "config.h" -#ifdef HAVE_MATROSKA #include <stdlib.h> #include <stdio.h> @@ -3618,5 +3617,3 @@ demux_mkv_seek, demux_mkv_control }; - -#endif /* HAVE_MATROSKA */
--- a/libmpdemux/demuxer.c Mon May 08 21:12:59 2006 +0000 +++ b/libmpdemux/demuxer.c Mon May 08 21:41:15 2006 +0000 @@ -81,9 +81,7 @@ &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,