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)
commit362372c46be6f4b885f741271687f2dae6435db9
tree47e52affc69812ed7264d7b502c1ff63b87f166b
parent27aa69896bd6a816026f0fd57b12ad1fc147ab65
parent4723c6226aa1ece4099338cc9b38a9cef4fa4846
Merge commit '4723c6226aa1ece4099338cc9b38a9cef4fa4846'

* commit '4723c6226aa1ece4099338cc9b38a9cef4fa4846':
  dashenc: fix bitrate estimation with correct scaling

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