mirror of https://github.com/mpv-player/mpv
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
This commit is contained in:
parent
c5c7fbf3ff
commit
1c641db8c0
|
@ -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
|
||||
|
|
Loading…
Reference in New Issue