Merge commit '71852a1ba89abc8749e309d9d662c49d47e19531'
authorMatthieu Bouron <matthieu.bouron@stupeflix.com>
Thu, 23 Jun 2016 15:57:34 +0000 (17:57 +0200)
committerMatthieu Bouron <matthieu.bouron@stupeflix.com>
Thu, 23 Jun 2016 15:57:34 +0000 (17:57 +0200)
commitdc62016c4b77a48284b24ad927eb68035b133925
treefbff705b0c08386ce5574075a000bfb46839e554
parenta86fe0d73827de47f77b90cf9227b992207b11b9
parent71852a1ba89abc8749e309d9d662c49d47e19531
Merge commit '71852a1ba89abc8749e309d9d662c49d47e19531'

* commit '71852a1ba89abc8749e309d9d662c49d47e19531':
  matroskaenc: Provide output bytestream markers

Merged-by: Matthieu Bouron <matthieu.bouron@stupeflix.com>
libavformat/matroskaenc.c