[FFmpeg-cvslog] Merge commit 'df33a58e5311ee9a64a573889b883a80e981af7b'

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michaelni at gmx.at> | Tue Sep  3 14:28:49 2013 +0200| [d07d54fd56034bc42b4f3d5242278f0e62f84abb] | committer: Michael Niedermayer

Merge commit 'df33a58e5311ee9a64a573889b883a80e981af7b'

* commit 'df33a58e5311ee9a64a573889b883a80e981af7b':
  lavf: avoid integer overflow when estimating bitrate

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

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