Merge commit 'c64f3615118d757dcf76040fe5407bf2b3883206'
authorMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 12:00:10 +0000 (13:00 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Mon, 17 Nov 2014 12:01:39 +0000 (13:01 +0100)
commit4127d97c8de6a1246d4414799f6aa4d8a45e2243
tree1756cd5113ecfb6c540cf6958ba882615a817c27
parentbb7be3b763d37c1e869431a76da7a8a2ddf1d9f9
parentc64f3615118d757dcf76040fe5407bf2b3883206
Merge commit 'c64f3615118d757dcf76040fe5407bf2b3883206'

* commit 'c64f3615118d757dcf76040fe5407bf2b3883206':
  flvenc: Send new metadata when FLAG_METADATA_UPDATED is set.

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