Commit 197661eb authored by Jean-Baptiste Kempf's avatar Jean-Baptiste Kempf

MKV: force EBML_STRICT_API

parent b985df92
...@@ -2374,21 +2374,21 @@ if test "${enable_mkv}" != "no" -a "${CXX}" != ""; then ...@@ -2374,21 +2374,21 @@ if test "${enable_mkv}" != "no" -a "${CXX}" != ""; then
#endif], #endif],
[AC_MSG_RESULT([yes]) [AC_MSG_RESULT([yes])
AC_CHECK_HEADERS(matroska/KaxAttachments.h) AC_CHECK_HEADERS(matroska/KaxAttachments.h)
VLC_ADD_CXXFLAGS([mkv],[]) VLC_ADD_CXXFLAGS([mkv],[-DEBML_STRICT_API])
if test "${SYS}" = "darwin"; then if test "${SYS}" = "darwin"; then
VLC_ADD_CXXFLAGS([mkv],[-O1]) VLC_ADD_CXXFLAGS([mkv],[-O1])
fi fi
AC_CHECK_LIB(ebml_pic, main, [ AC_CHECK_LIB(ebml_pic, main, [
VLC_ADD_PLUGIN([mkv]) VLC_ADD_PLUGIN([mkv])
VLC_ADD_LIBS([mkv],[-lmatroska -lebml_pic]) VLC_ADD_LIBS([mkv],[-lmatroska -lebml_pic])
], ],[
AC_CHECK_LIB(ebml, main, [ AC_CHECK_LIB(ebml, main, [
VLC_ADD_PLUGIN([mkv]) VLC_ADD_PLUGIN([mkv])
VLC_ADD_LIBS([mkv],[-lmatroska -lebml]) VLC_ADD_LIBS([mkv],[-lmatroska -lebml])
]) ])
) ])
], ], [
[AC_MSG_RESULT([no]) AC_MSG_RESULT([no])
AC_MSG_ERROR([Your libmatroska is too old: you may get a more recent one from http://dl.matroska.org/downloads/libmatroska/. Alternatively you can use --disable-mkv to disable the matroska plugin.]) AC_MSG_ERROR([Your libmatroska is too old: you may get a more recent one from http://dl.matroska.org/downloads/libmatroska/. Alternatively you can use --disable-mkv to disable the matroska plugin.])
]) ])
]) ])
......
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