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)
commit43c18fec6e7cee336b5cf3ea5b0c6503410d6b73
tree78c7ba64d87fe903e90734b6f2a4a388201bb88b
parentf78bc96b7c1c74caf99a7139cf81ce1110404965
parent584f88409062f7a134e7391887899e8e723ab6ff
Merge commit '584f88409062f7a134e7391887899e8e723ab6ff'

* commit '584f88409062f7a134e7391887899e8e723ab6ff':
  riff: Pass block_align to estimate frame duration

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