Skip to content

V
vlc-1.1
Commit d4dec3d8 authored by Laurent Aimar's avatar Laurent Aimar
Browse files
Options

Upgrade mandatory version for matroska to 0.8.0 and ebml to 0.7.7.

parent a5eae754
Expand all Show whitespace changes
Inline Side-by-side
Showing with 16 additions and 112 deletions
configure.ac
View file @ d4dec3d8
...@@ -2745,7 +2745,7 @@ AC_ARG_ENABLE(mkv, ...@@ -2745,7 +2745,7 @@ AC_ARG_ENABLE(mkv,
if test "${enable_mkv}" != "no" -a "${CXX}" != ""; then if test "${enable_mkv}" != "no" -a "${CXX}" != ""; then
AC_LANG_PUSH(C++) AC_LANG_PUSH(C++)
AC_CHECK_HEADERS(ebml/EbmlVersion.h, [ AC_CHECK_HEADERS(ebml/EbmlVersion.h, [
AC_MSG_CHECKING(for libebml version >= 0.7.6) AC_MSG_CHECKING(for libebml version >= 0.7.7)
AC_EGREP_CPP(yes, AC_EGREP_CPP(yes,
[#include <ebml/EbmlVersion.h> [#include <ebml/EbmlVersion.h>
#ifdef LIBEBML_VERSION #ifdef LIBEBML_VERSION
...@@ -2755,7 +2755,7 @@ if test "${enable_mkv}" != "no" -a "${CXX}" != ""; then ...@@ -2755,7 +2755,7 @@ if test "${enable_mkv}" != "no" -a "${CXX}" != ""; then
#endif], #endif],
[AC_MSG_RESULT([yes]) [AC_MSG_RESULT([yes])
AC_CHECK_HEADERS(matroska/KaxVersion.h, [ AC_CHECK_HEADERS(matroska/KaxVersion.h, [
AC_MSG_CHECKING(for libmatroska version >= 0.7.7) AC_MSG_CHECKING(for libmatroska version >= 0.8.0)
AC_EGREP_CPP(yes, AC_EGREP_CPP(yes,
[#include <matroska/KaxVersion.h> [#include <matroska/KaxVersion.h>
#ifdef LIBMATROSKA_VERSION #ifdef LIBMATROSKA_VERSION
......
modules/demux/mkv.cpp
View file @ d4dec3d8
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment