Added the new C based Matroska demuxer by Aurelien Jacobs.

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11808 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 30 insertions, 16 deletions

diff --git a/configure b/configure
index a88ad192bf..9ed72f2691 100755
--- a/configure
+++ b/configure
@@ -203,7 +203,8 @@ Codecs:
   --enable-vorbis        build with OggVorbis support [autodetect]
   --enable-tremor        build with integer-only OggVorbis support [disabled]
   --enable-theora        build with OggTheora support [autodetect]
-  --enable-matroska      build with Matroska support [autodetect]
+  --enable-external-matroska  build with external Matroska 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-libdv        disable libdv 0.9.5 en/decoding support [autodetect]
@@ -1144,7 +1145,8 @@ _liblzo=auto
 _mad=auto
 _vorbis=auto
 _theora=auto
-_matroska=auto
+_matroska_internal=yes
+_matroska_external=auto
 _tremor=no
 _faad_internal=auto
 _faad_external=auto
@@ -1310,8 +1312,10 @@ for ac_option do
   --disable-tremor)	_tremor=no	;;
   --enable-theora)	_theora=yes	;;
   --disable-theora)	_theora=no	;;
-  --enable-matroska)    _matroska=yes   ;;
-  --disable-matroska)   _matroska=no    ;;
+  --enable-internal-matroska)  _matroska_internal=yes _matroska_external=no ;;
+  --disable-internal-matroska) _matroska_internal=no ;;
+  --enable-external-matroska)  _matroska_internal=no  _matroska_external=yes ;;
+  --disable-external-matroska) _matroska_external=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	;;
@@ -4494,9 +4498,15 @@ fi
 echores "$_theora"
 
 
-echocheck "Matroska support (0.6.0 or later)"
-if test "$_matroska" != no ; then
-  _matroska=no
+echocheck "Matroska support (external 0.6.0 or later OR internal)"
+_matroska_result="no"
+if test "$_matroska_internal" = yes ; then
+  _matroska_external=no
+  _inputmodules="matroska(internal) $_inputmodules"
+  _matroska_result="yes, internal"
+fi
+if test "$_matroska_external" != no ; then
+  _matroska_external=no
   _TMPC=$TMPC
   TMPC=${TMPC}pp
   cat > $TMPC << EOF
@@ -4513,27 +4523,30 @@ if test "$_matroska" != no ; then
 
 int main(void) { return 0; }
 EOF
-  cc_check -lmatroska -lebml -lstdc++ && _matroska=yes
-  if test "$_matroska" = no ; then
+  cc_check -lmatroska -lebml -lstdc++ && _matroska_external=yes
+  if test "$_matroska_external" = no ; then
     _saved_inc_extra=$_inc_extra
     _inc_extra="$_inc_extra -I/usr/local/include"
-    cc_check -lmatroska -lebml -lstdc++ && _matroska=yes
-    if test "$_matroska" = no ; then
+    cc_check -lmatroska -lebml -lstdc++ && _matroska_external=yes
+    if test "$_matroska_external" = no ; then
       _inc_extra=$_saved_inc_extra
     fi
   fi
   rm ${TMPC} > /dev/null 2> /dev/null
   TMPC=$_TMPC
+  if test "$_matroska_external" = yes ; then
+    _ld_matroska="-lmatroska -lebml -lstdc++"
+    _inputmodules="matroska(external) $_inputmodules"
+    _matroska_result="yes, external"
+  fi
 fi
-if test "$_matroska" = yes ; then
+echores "$_matroska_result"
+if test "$_matroska_internal" != no -o "$_matroska_external" != no ; then
   _def_matroska='#define HAVE_MATROSKA 1'
-  _inputmodules="matroska $_inputmodules"
-  _ld_matroska="-lmatroska -lebml -lstdc++"
 else
   _def_matroska='#undef HAVE_MATROSKA'
   _noinputmodules="matroska $_noinputmodules"
 fi
-echores "$_matroska"
 
 
 
@@ -5831,7 +5844,8 @@ CONFIG_RISKY = yes
 CONFIG_MP3LAME = $_mp3lame
 LIBMENU = $_menu
 I18NLIBS = $_i18n_libs
-MATROSKA = $_matroska
+MATROSKA_INTERNAL = $_matroska_internal
+MATROSKA_EXTERNAL = $_matroska_external
 MATROSKA_LIB = $_ld_matroska
 
 OPENDIVX = $_opendivx