RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-18 21:27:00 +00:00
Code Issues Releases Wiki Activity

Unconditionally compile the Matroska demuxer.

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18405 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2006-05-08 21:41:15 +00:00
parent bf83d1a8ca
commit bc30e8e673
5 changed files with 1 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure vendored
View File

@ -279,7 +279,6 @@ Codecs:
--disable-vorbis disable OggVorbis support entirely [autodetect] --disable-vorbis disable OggVorbis support entirely [autodetect]
--disable-speex disable Speex support [autodetect] --disable-speex disable Speex support [autodetect]
--enable-theora build with OggTheora 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] --enable-external-faad build with external FAAD2 (AAC) support [autodetect]
--disable-internal-faad disable internal FAAD2 (AAC) support [autodetect] --disable-internal-faad disable internal FAAD2 (AAC) support [autodetect]
--disable-faac disable support for FAAC (AAC encoder) [autodetect] --disable-faac disable support for FAAC (AAC encoder) [autodetect]
@ -1578,7 +1577,6 @@ _mp3lib=yes
_liba52=yes _liba52=yes
_libdts=auto _libdts=auto
_libmpeg2=yes _libmpeg2=yes
_matroska_internal=yes
_tremor=no _tremor=no
_faad_internal=auto _faad_internal=auto
_faad_external=auto _faad_external=auto
@ -1793,8 +1791,6 @@ for ac_option do
--disable-libmpeg2) _libmpeg2=no ;; --disable-libmpeg2) _libmpeg2=no ;;
--enable-musepack) _musepack=yes ;; --enable-musepack) _musepack=yes ;;
--disable-musepack) _musepack=no ;; --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 ;; --enable-internal-faad) _faad_internal=yes _faad_external=no ;;
--disable-internal-faad) _faad_internal=no ;; --disable-internal-faad) _faad_internal=no ;;
--enable-external-faad) _faad_external=yes _faad_internal=no ;; --enable-external-faad) _faad_external=yes _faad_internal=no ;;
@ -5715,16 +5711,6 @@ fi
echores "$_musepack" 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" echocheck "FAAC (AAC encoder) support"
if test "$_faac" = auto ; then if test "$_faac" = auto ; then
cat > $TMPC <<EOF cat > $TMPC <<EOF
@ -7326,7 +7312,6 @@ EXTERNAL_VIDIX_LIB = $_ld_vidix_external
CONFIG_PP = yes CONFIG_PP = yes
CONFIG_MP3LAME = $_mp3lame CONFIG_MP3LAME = $_mp3lame
LIBMENU = $_menu LIBMENU = $_menu
MATROSKA = $_matroska_internal
OPENDIVX = $_opendivx OPENDIVX = $_opendivx
@ -8069,9 +8054,6 @@ $_def_musepack
/* enable OggTheora support */ /* enable OggTheora support */
$_def_theora $_def_theora
/* enable Matroska support */
$_def_matroska
/* enable FAAD (AAC) support */ /* enable FAAD (AAC) support */
$_def_faad $_def_faad
$_def_faad_internal $_def_faad_internal

4
libmpdemux/Makefile
View File

@ -86,6 +86,7 @@ SRCS += demuxer.c \
demux_viv.c \ demux_viv.c \
demux_vqf.c \ demux_vqf.c \
demux_y4m.c \ demux_y4m.c \
demux_mkv.c ebml.c \
ifeq ($(HAVE_DVD),yes) ifeq ($(HAVE_DVD),yes)
SRCS += stream_dvd.c SRCS += stream_dvd.c
@ -96,9 +97,6 @@ endif
ifneq ($(W32_LIB),) ifneq ($(W32_LIB),)
SRCS += demux_avs.c SRCS += demux_avs.c
endif endif
ifeq ($(MATROSKA),yes)
SRCS += demux_mkv.c ebml.c
endif
# Muxers # Muxers
MUXERS = muxer.c \ MUXERS = muxer.c \

3
libmpdemux/demux_mkv.c
View File

@ -7,7 +7,6 @@
*/ */
#include "config.h" #include "config.h"
#ifdef HAVE_MATROSKA
#include <stdlib.h> #include <stdlib.h>
#include <stdio.h> #include <stdio.h>
@ -3618,5 +3617,3 @@ demuxer_desc_t demuxer_desc_matroska = {
demux_mkv_seek, demux_mkv_seek,
demux_mkv_control demux_mkv_control
}; };
#endif /* HAVE_MATROSKA */

2
libmpdemux/demuxer.c
View File

@ -81,9 +81,7 @@ demuxer_desc_t* demuxer_list[] = {
&demuxer_desc_nuv, &demuxer_desc_nuv,
&demuxer_desc_real, &demuxer_desc_real,
&demuxer_desc_smjpeg, &demuxer_desc_smjpeg,
#ifdef HAVE_MATROSKA
&demuxer_desc_matroska, &demuxer_desc_matroska,
#endif
&demuxer_desc_realaudio, &demuxer_desc_realaudio,
&demuxer_desc_vqf, &demuxer_desc_vqf,
&demuxer_desc_mov, &demuxer_desc_mov,

3
libmpdemux/ebml.c
View File

@ -6,7 +6,6 @@
*/ */
#include "config.h" #include "config.h"
#ifdef HAVE_MATROSKA
#include <stdlib.h> #include <stdlib.h>
@ -363,5 +362,3 @@ ebml_read_header (stream_t *s, int *version)
return str; return str;
} }
#endif /* HAVE_MATROSKA */