Merge commit '4d0cd5f58c892276716f46f4b2702915e5018215'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 11:43:55 +0000 (12:43 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 11:43:55 +0000 (12:43 +0100)
commitbb7be3b763d37c1e869431a76da7a8a2ddf1d9f9
tree572112bf0e75ba083b8a777c379b74abfb25b031
parentc88ae843da4a9589a6ef1138fb9d9aaa28add2d3
parent4d0cd5f58c892276716f46f4b2702915e5018215
Merge commit '4d0cd5f58c892276716f46f4b2702915e5018215'

* commit '4d0cd5f58c892276716f46f4b2702915e5018215':
  flvenc: move metadata updates into a single function

Conflicts:
libavformat/flvenc.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavformat/flvenc.c