Merge commit '43e7f0797f9f821a3866a20f05e512e13c82076a'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 May 2014 11:26:55 +0000 (13:26 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 May 2014 11:30:12 +0000 (13:30 +0200)
* 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@gmx.at>
1  2 
libavformat/flvenc.c

Simple merge