From: Moritz Bunkus Date: Mon, 22 Jun 2020 07:37:54 +0000 (+0200) Subject: Merge pull request #30 from Matroska-Org/enc-algo-mandatory X-Git-Tag: release-1.6.0~23 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=aae418906abf88a31e4b310cf109146f88204839;p=libmatroska Merge pull request #30 from Matroska-Org/enc-algo-mandatory fix ContentEncAlgo assumed not to be mandatory --- aae418906abf88a31e4b310cf109146f88204839 diff --cc src/KaxSemantic.cpp index 6567c2a,061fd14..7ce5ee0 --- a/src/KaxSemantic.cpp +++ b/src/KaxSemantic.cpp @@@ -501,9 -547,8 +501,9 @@@ DEFINE_MKX_UINTEGER_DEF(KaxContentCompA DEFINE_MKX_BINARY (KaxContentCompSettings, 0x4255, 2, KaxContentCompression, "ContentCompSettings") DEFINE_START_SEMANTIC(KaxContentEncryption) - DEFINE_SEMANTIC_ITEM(false, true, KaxContentEncAlgo) + DEFINE_SEMANTIC_ITEM(true, true, KaxContentEncAlgo) DEFINE_SEMANTIC_ITEM(false, true, KaxContentEncKeyID) +DEFINE_SEMANTIC_ITEM(false, true, KaxContentEncAESSettings) DEFINE_SEMANTIC_ITEM(false, true, KaxContentSignature) DEFINE_SEMANTIC_ITEM(false, true, KaxContentSigKeyID) DEFINE_SEMANTIC_ITEM(false, true, KaxContentSigAlgo)