RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Necessary changes for the upcoming libebml/libmatroska 0.5.0. Implemented support for RealAudio and RealVideo inside Matroska. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@10411 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
mosu 2003-07-11 20:24:20 +00:00
parent 6ab50ab057
commit 0723498eef
3 changed files with 557 additions and 196 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
configure vendored
View File

@ -4169,35 +4169,40 @@ fi
echores "$_theora"
echocheck "Matroska support"
echocheck "Matroska support (0.5.0 or later)"
if test "$_matroska" != no ; then
_matroska=no
_TMPC=$TMPC
TMPC=${TMPC}pp
cat > $TMPC << EOF
#include <EbmlConfig.h>
#include <ebml/EbmlVersion.h>
#include <matroska/KaxVersion.h>
#if LIBEBML_VERSION < 000500
#error libebml is too old
#endif
#if LIBMATROSKA_VERSION < 000500
#error libmatroska is too old
#endif
int main(void) { return 0; }
EOF
cc_check -lmatroska -lebml && _matroska=yes
cc_check -lmatroska -lebml -lstdc++ && _matroska=yes
if test "$_matroska" = no ; then
_saved_inc_extra=$_inc_extra
_inc_extra="$_inc_extra -I/usr/include/ebml -I/usr/include/matroska"
cc_check -lmatroska -lebml && _matroska=yes
if test "$_matroska" = no ; then
_inc_extra="$_saved_inc_extra -I/usr/local/include/ebml -I/usr/local/include/matroska"
cc_check -lmatroska -lebml && _matroska=yes
_inc_extra="$_inc_extra -I/usr/local/include"
cc_check -lmatroska -lebml -lstdc++ && _matroska=yes
if test "$_matroska" = no ; then
_inc_extra=$_saved_inc_extra
fi
fi
fi
TMPC=$_TMPC
fi
if test "$_matroska" = yes ; then
_def_matroska='#define HAVE_MATROSKA 1'
_inputmodules="matroska $_inputmodules"
_ld_matroska="-lmatroska -lebml -lstdc++"
case $cc_version in
2.*) _def_matroska_gcc2="#define LIBEBML_GCC2" ;;
*) _def_matroska_gcc2="/*#define LIBEBML_GCC2*/" ;;
esac
else
_def_matroska='#undef HAVE_MATROSKA'
_noinputmodules="matroska $_noinputmodules"
@ -5870,7 +5875,6 @@ $_def_theora
/* enable Matroska support */
$_def_matroska
$_def_matroska_gcc2
/* enable FAAD (AAC) support */
$_def_faad

638
libmpdemux/demux_mkv.cpp
View File

File diff suppressed because it is too large Load Diff

9
libmpdemux/matroska.h
View File

@ -21,8 +21,17 @@
#define MKV_A_PCM "A_PCM/INT/LIT"
#define MKV_A_VORBIS "A_VORBIS"
#define MKV_A_ACM "A_MS/ACM"
#define MKV_A_REAL28 "A_REAL/28_8"
#define MKV_A_REALATRC "A_REAL/ATRC"
#define MKV_A_REALCOOK "A_REAL/COOK"
#define MKV_A_REALDNET "A_REAL/DNET"
#define MKV_A_REALSIPR "A_REAL/SIPR"
#define MKV_V_MSCOMP "V_MS/VFW/FOURCC"
#define MKV_V_REALV10 "V_REAL/RV10"
#define MKV_V_REALV20 "V_REAL/RV20"
#define MKV_V_REALV30 "V_REAL/RV30"
#define MKV_V_REALV40 "V_REAL/RV40"
#define MKV_S_TEXTASCII "S_TEXT/ASCII"
#define MKV_S_TEXTUTF8 "S_TEXT/UTF8"