[FFmpeg-cvslog] Merge commit '74bc9458057f07c0820c3d3264396c4c64442e47'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Wed Jun 18 01:44:24 2014 +0200| [3f2f87cd5a84dc44de76af49a05778cb89f6de5c] | committer: Michael Niedermayer

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 at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=3f2f87cd5a84dc44de76af49a05778cb89f6de5c
---