Michael Niedermayer 3f2f87cd5a 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>

2014-06-18 01:44:24 +02:00

22 KiB

Raw Blame History

View Raw