[vlc-commits] MKV: force EBML_STRICT_API

Jean-Baptiste Kempf git at videolan.org
Sun Jan 30 21:00:52 CET 2011


vlc | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sun Jan 30 20:58:29 2011 +0100| [197661eb6386fc816af26f54b214a91a927802fb] | committer: Jean-Baptiste Kempf

MKV: force EBML_STRICT_API

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=197661eb6386fc816af26f54b214a91a927802fb
---

 configure.ac |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4744372..ea6c711 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2374,21 +2374,21 @@ if test "${enable_mkv}" != "no" -a "${CXX}" != ""; then
              #endif],
             [AC_MSG_RESULT([yes])
               AC_CHECK_HEADERS(matroska/KaxAttachments.h)
-              VLC_ADD_CXXFLAGS([mkv],[])
+              VLC_ADD_CXXFLAGS([mkv],[-DEBML_STRICT_API])
               if test "${SYS}" = "darwin"; then
                 VLC_ADD_CXXFLAGS([mkv],[-O1])
               fi
               AC_CHECK_LIB(ebml_pic, main, [
                 VLC_ADD_PLUGIN([mkv])
                 VLC_ADD_LIBS([mkv],[-lmatroska -lebml_pic])
-              ],
+              ],[
                 AC_CHECK_LIB(ebml, main, [
                   VLC_ADD_PLUGIN([mkv])
                   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.])
           ])
         ])



More information about the vlc-commits mailing list