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)
* 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>
1  2 
libavformat/flvenc.c

Simple merge