Commit f658df91 authored by Steve Lhomme's avatar Steve Lhomme

libebml2: better context when a MASTER_CHECK_MULTIPLE_UNIQUE error occur

git-svn-id: https://matroska.svn.sourceforge.net/svnroot/matroska/trunk/foundation_src@749 a6f86f6d-0131-4f8e-9e7b-e335508773d5
parent a0ffe7d3
......@@ -636,10 +636,10 @@ void EBML_MasterCheckContext(ebml_master *Element, int ProfileMask, bool_t (*Err
break;
}
}
if (s->Unique && (SubElt=EBML_MasterFindChild(Element,s->eClass)) && EBML_MasterNextChild(Element,SubElt))
if (s->Unique && (SubElt=EBML_MasterFindChild(Element,s->eClass)) && (SubElt=EBML_MasterNextChild(Element,SubElt)))
{
Node_FromStr(Element,ClassString,TSIZEOF(ClassString),s->eClass->ElementName);
if (ErrCallback && ErrCallback(cookie,MASTER_CHECK_MULTIPLE_UNIQUE,ClassString,i))
if (ErrCallback && ErrCallback(cookie,MASTER_CHECK_MULTIPLE_UNIQUE,ClassString,SubElt))
{
EBML_MasterRemove(Element,i); // make sure it doesn't remain in the list
NodeDelete((node*)i);
......
......@@ -3,7 +3,7 @@
GROUP ebml2_group
{
PROJECT_NAME "libebml2"
PROJECT_VERSION 0.21.0
PROJECT_VERSION 0.21.1
PROJECT_VENDOR "Matroska"
EXPDEFINE HAS_EBML2
......
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