Merge commit '4723c6226aa1ece4099338cc9b38a9cef4fa4846'
authorJames Almer <jamrial@gmail.com>
Sun, 12 Nov 2017 03:15:57 +0000 (00:15 -0300)
committerJames Almer <jamrial@gmail.com>
Sun, 12 Nov 2017 03:15:57 +0000 (00:15 -0300)
* commit '4723c6226aa1ece4099338cc9b38a9cef4fa4846':
  dashenc: fix bitrate estimation with correct scaling

Merged-by: James Almer <jamrial@gmail.com>
1  2 
libavformat/dashenc.c

Simple merge