summaryrefslogtreecommitdiff
path: root/libavformat
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2017-11-12 00:15:57 -0300
committerJames Almer <jamrial@gmail.com>2017-11-12 00:15:57 -0300
commit362372c46be6f4b885f741271687f2dae6435db9 (patch)
tree47e52affc69812ed7264d7b502c1ff63b87f166b /libavformat
parent27aa69896bd6a816026f0fd57b12ad1fc147ab65 (diff)
parent4723c6226aa1ece4099338cc9b38a9cef4fa4846 (diff)
Merge commit '4723c6226aa1ece4099338cc9b38a9cef4fa4846'
* commit '4723c6226aa1ece4099338cc9b38a9cef4fa4846': dashenc: fix bitrate estimation with correct scaling Merged-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavformat')
-rw-r--r--libavformat/dashenc.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c
index 7813f4485a..d5554d1df0 100644
--- a/libavformat/dashenc.c
+++ b/libavformat/dashenc.c
@@ -1005,7 +1005,9 @@ static int dash_flush(AVFormatContext *s, int final, int stream)
if (!os->bit_rate) {
// calculate average bitrate of first segment
- int64_t bitrate = (int64_t) range_length * 8 / ((os->max_pts - os->start_pts) * av_q2d(st->time_base));
+ int64_t bitrate = (int64_t) range_length * 8 * AV_TIME_BASE / av_rescale_q(os->max_pts - os->start_pts,
+ st->time_base,
+ AV_TIME_BASE_Q);
if (bitrate >= 0) {
os->bit_rate = bitrate;
snprintf(os->bandwidth_str, sizeof(os->bandwidth_str),