Merge commit 'cf6977712c9e5abe6dc55289f6322ccbf10321a9'
authorMichael Niedermayer <michaelni@gmx.at>
Thu, 29 May 2014 11:05:35 +0000 (13:05 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Thu, 29 May 2014 11:07:33 +0000 (13:07 +0200)
* commit 'cf6977712c9e5abe6dc55289f6322ccbf10321a9':
  movenc: write avg_frame_rate as the framerate, not the codec timebase

Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavformat/movenc.c

Simple merge