Merge commit '584f88409062f7a134e7391887899e8e723ab6ff'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 17 May 2014 18:22:53 +0000 (20:22 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 17 May 2014 18:22:56 +0000 (20:22 +0200)
* commit '584f88409062f7a134e7391887899e8e723ab6ff':
  riff: Pass block_align to estimate frame duration

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

Simple merge