Merge commit '9026ec8aaf5fa19cb4fb266c16f608af0d863b2b'
authorClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 08:46:24 +0000 (10:46 +0200)
committerClément Bœsch <cboesch@gopro.com>
Fri, 5 May 2017 08:46:24 +0000 (10:46 +0200)
commite6ee42febbdeaaab779a66c5002155c78a3eae8d
tree66491c83a412fafb161cbe74778a6cdc7ff4980e
parent730f75a099f82d21855442a76a699b36acb89bbb
parent9026ec8aaf5fa19cb4fb266c16f608af0d863b2b
Merge commit '9026ec8aaf5fa19cb4fb266c16f608af0d863b2b'

* commit '9026ec8aaf5fa19cb4fb266c16f608af0d863b2b':
  matroskadec: make sure not to leave EbmlBin in an inconsistent state

This commit is a noop, see 5e1bacf2d49622f7ba4245f140b7be35972c0529

Merged-by: Clément Bœsch <cboesch@gopro.com>