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)
* 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>

Trivial merge