Merge commit '74bc9458057f07c0820c3d3264396c4c64442e47'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Jun 2014 23:44:24 +0000 (01:44 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 17 Jun 2014 23:44:24 +0000 (01:44 +0200)
commit3f2f87cd5a84dc44de76af49a05778cb89f6de5c
treec3439e4528554f0c841ffb60fe2beba0cf162d19
parent9f028b3f3af549a95b4a50af6a1d02acc5089a9f
parent74bc9458057f07c0820c3d3264396c4c64442e47
Merge commit '74bc9458057f07c0820c3d3264396c4c64442e47'

* commit '74bc9458057f07c0820c3d3264396c4c64442e47':
  flvenc: Don't over-count metadata.

Conflicts:
tests/ref/lavf/flv_fmt
tests/ref/vsynth/vsynth1-flashsv
tests/ref/vsynth/vsynth1-flv
tests/ref/vsynth/vsynth2-flashsv
tests/ref/vsynth/vsynth2-flv

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