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)
* qatar/master:
  sipr: fall back to setting mode based on bit_rate.

Conflicts:
libavcodec/sipr.c

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

Simple merge