Merge remote-tracking branch 'qatar/master'
authorMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Sep 2012 12:04:44 +0000 (14:04 +0200)
committerMichael Niedermayer <michaelni@gmx.at>
Sat, 22 Sep 2012 12:04:44 +0000 (14:04 +0200)
commit8364bde02b24c26f4fd7e154149293c10ad8389a
treef669f19752f56a31b397229569e231a195f7ab51
parent79bf1f0ad03f17bb00913fdef6e955d3c46c8a92
parentc54e00610f20d2342fe9b17a5460abfbd411c8fb
Merge remote-tracking branch 'qatar/master'

* qatar/master:
  sipr: fall back to setting mode based on bit_rate.

Conflicts:
libavcodec/sipr.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>
libavcodec/sipr.c