diff --git a/ac/matroska.m4 b/ac/matroska.m4 index e4bb9473c..d71580f65 100644 --- a/ac/matroska.m4 +++ b/ac/matroska.m4 @@ -30,44 +30,6 @@ if test x"$EBML_MATROSKA_INTERNAL" = xyes; then fi fi -AC_DEFUN([AX_EBML_FINDNEXTCHILD],[ - AC_CACHE_CHECK([if libEBML contains FindNextChild], [ax_cv_ebml_findnextchild],[ - if test x"$EBML_MATROSKA_INTERNAL" = xyes; then - ax_cv_ebml_findnextchild=yes - else - CXXFLAGS_SAVED=$CXXFLAGS - CXXFLAGS="$EBML_CFLAGS $MATROSKA_CFLAGS" - export CXXFLAGS - - AC_LANG_PUSH(C++) - AC_TRY_COMPILE( - [ -#include -#include - -using namespace libebml; -using namespace libmatroska; - ], - [ - EbmlMaster *m = new KaxSegment; - EbmlElement *e = new KaxTitle; - FindNextChild(*m, *e); - ], - [ax_cv_ebml_findnextchild="yes"], - [ax_cv_ebml_findnextchild="no"]) - AC_LANG_POP - - CXXFLAGS="$CXXFLAGS_SAVED" - fi - ]) - - if test x"$ax_cv_ebml_findnextchild" = xyes; then - AC_DEFINE(HAVE_EBML_FINDNEXTCHILD, 1, [Define if libEBML contains FindNextChild]) - fi -]) - -AX_EBML_FINDNEXTCHILD - AC_SUBST(EBML_MATROSKA_INTERNAL) AC_SUBST(EBML_CFLAGS) AC_SUBST(EBML_LIBS) diff --git a/src/common/ebml.h b/src/common/ebml.h index 100f8527a..16b3242a7 100644 --- a/src/common/ebml.h +++ b/src/common/ebml.h @@ -209,14 +209,6 @@ FindChild(libebml::EbmlElement const *e) { return static_cast(m->FindFirstElt(EBML_INFO(A))); } -#if !defined(HAVE_EBML_FINDNEXTCHILD) -template A* -FindNextChild(libebml::EbmlMaster &Master, - A const &PastElt) { - return static_cast(Master.FindNextElt(PastElt, false)); -} -#endif // !HAVE_EBML_FINDNEXTCHILD - template A & GetChild(libebml::EbmlMaster *m) { return GetChild(*m);