* qatar/master: sipr: fall back to setting mode based on bit_rate. Conflicts: libavcodec/sipr.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
19 KiB
19 KiB
* qatar/master: sipr: fall back to setting mode based on bit_rate. Conflicts: libavcodec/sipr.c Merged-by: Michael Niedermayer <michaelni@gmx.at>