diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2012-09-22 14:04:44 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2012-09-22 14:04:44 +0200 |
| commit | 8364bde02b24c26f4fd7e154149293c10ad8389a (patch) | |
| tree | f669f19752f56a31b397229569e231a195f7ab51 /libavcodec/avuienc.c | |
| parent | 79bf1f0ad03f17bb00913fdef6e955d3c46c8a92 (diff) | |
| parent | c54e00610f20d2342fe9b17a5460abfbd411c8fb (diff) | |
| download | ffmpeg-8364bde02b24c26f4fd7e154149293c10ad8389a.tar.gz | |
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>
Diffstat (limited to 'libavcodec/avuienc.c')
0 files changed, 0 insertions, 0 deletions