[FFmpeg-cvslog] Merge commit '584f88409062f7a134e7391887899e8e723ab6ff'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Sat May 17 20:22:53 2014 +0200| [43c18fec6e7cee336b5cf3ea5b0c6503410d6b73] | committer: Michael Niedermayer

Merge commit '584f88409062f7a134e7391887899e8e723ab6ff'

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

Merged-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=43c18fec6e7cee336b5cf3ea5b0c6503410d6b73
---