Merge commit '371df9ba71393a1c5429d5f40c76348b30e556c7'
authorMatthieu Bouron <matthieu.bouron@stupeflix.com>
Thu, 23 Jun 2016 15:43:19 +0000 (17:43 +0200)
committerMatthieu Bouron <matthieu.bouron@stupeflix.com>
Thu, 23 Jun 2016 15:43:19 +0000 (17:43 +0200)
commit625eb4108675b000626a493c36600062938aaa63
tree44d4fdd012330e0387d63aa8e265f07151266c4a
parent5d75e4667742c851e21dcd6ce70154834fb7d22b
parent371df9ba71393a1c5429d5f40c76348b30e556c7
Merge commit '371df9ba71393a1c5429d5f40c76348b30e556c7'

* commit '371df9ba71393a1c5429d5f40c76348b30e556c7':
  flvenc: Provide output bytestream markers

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