summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-10-30 14:57:06 +0000
committermosu <mosu@b3059339-0415-0410-9bf9-f77b7e298cf2>2003-10-30 14:57:06 +0000
commit1c641db8c04aaa6b7dd645285e6f64b123d8d6fe (patch)
tree51f879a5ca1271a25374c1bf787c2f6620c50192
parentc5c7fbf3fff6021cbb3248869b83a670751082b0 (diff)
downloadmpv-1c641db8c04aaa6b7dd645285e6f64b123d8d6fe.tar.bz2
mpv-1c641db8c04aaa6b7dd645285e6f64b123d8d6fe.tar.xz
Removed temporary .cpp file used during the Matroska test. Updated the libebml and libmatroska requirements to at least v0.6.0 for both. There have been changes in the lacing code, and users WILL come and complain why mplayer, linked against older versions, will have issues playing newer files.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@11331 b3059339-0415-0410-9bf9-f77b7e298cf2
-rwxr-xr-xconfigure7
1 files changed, 4 insertions, 3 deletions
diff --git a/configure b/configure
index 4a0b19f213..fa1af5db3a 100755
--- a/configure
+++ b/configure
@@ -4374,7 +4374,7 @@ fi
echores "$_theora"
-echocheck "Matroska support (0.5.0 or later)"
+echocheck "Matroska support (0.6.0 or later)"
if test "$_matroska" != no ; then
_matroska=no
_TMPC=$TMPC
@@ -4383,11 +4383,11 @@ if test "$_matroska" != no ; then
#include <ebml/EbmlVersion.h>
#include <matroska/KaxVersion.h>
-#if LIBEBML_VERSION < 000500
+#if LIBEBML_VERSION < 000600
#error libebml is too old
#endif
-#if LIBMATROSKA_VERSION < 000500
+#if LIBMATROSKA_VERSION < 000600
#error libmatroska is too old
#endif
@@ -4402,6 +4402,7 @@ EOF
_inc_extra=$_saved_inc_extra
fi
fi
+ rm ${TMPC} > /dev/null 2> /dev/null
TMPC=$_TMPC
fi
if test "$_matroska" = yes ; then