[FFmpeg-cvslog] Merge commit '43e7f0797f9f821a3866a20f05e512e13c82076a'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Thu May 29 13:26:55 2014 +0200| [e46cc1dab05e366feaf98efc9bd2d57e2fa58410] | committer: Michael Niedermayer

Merge commit '43e7f0797f9f821a3866a20f05e512e13c82076a'

* commit '43e7f0797f9f821a3866a20f05e512e13c82076a':
  flvenc: only write the framerate tag based on avg_frame_rate

Conflicts:
	tests/ref/lavf/flv_fmt
	tests/ref/seek/lavf-flv_fmt
	tests/ref/seek/vsynth2-flv
	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=e46cc1dab05e366feaf98efc9bd2d57e2fa58410
---