Merge commit 'df33a58e5311ee9a64a573889b883a80e981af7b'
authorMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Sep 2013 12:28:49 +0000 (14:28 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Tue, 3 Sep 2013 12:45:53 +0000 (14:45 +0200)
commitd07d54fd56034bc42b4f3d5242278f0e62f84abb
treef8ac0ed393615a0c58c5645e48b98bba0edeafb3
parentb0ba2bf8c66fdae9761b36647b813c830984fb6c
parentdf33a58e5311ee9a64a573889b883a80e981af7b
Merge commit 'df33a58e5311ee9a64a573889b883a80e981af7b'

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

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