Merge remote-tracking branch 'cehoyos/master'
authorMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Apr 2014 22:17:31 +0000 (00:17 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Fri, 11 Apr 2014 22:17:35 +0000 (00:17 +0200)
commit27763db928b594208ce6e241e1eb48799093796e
treeb0456943086a8eda1f9aca8484c9b8bfc69712c7
parent88ceede1fd7835080da11c4e9a74af69bdfc5412
parentc43222f436e941db3764576fc967da66f3709c35
Merge remote-tracking branch 'cehoyos/master'

* cehoyos/master:
  Improve amr bitrate calculation for VBR files.
  Warn if rawvideo and an unreadable pix_fmt are written.

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