diff options
| author | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2002-11-11 13:45:34 +0000 |
|---|---|---|
| committer | Miguel Freitas <miguelfreitas@users.sourceforge.net> | 2002-11-11 13:45:34 +0000 |
| commit | 810ddddbc0d5f6587b9154115fa60d546d728310 (patch) | |
| tree | 67256930a6cd947fb3f09b070b19dedd4fbbcd10 /src/libffmpeg/libavcodec/ratecontrol.c | |
| parent | e38a8cca2c6be40954a44f167f7cc9fac0813ede (diff) | |
| download | xine-lib-810ddddbc0d5f6587b9154115fa60d546d728310.tar.gz xine-lib-810ddddbc0d5f6587b9154115fa60d546d728310.tar.bz2 | |
sync ffmpeg
- add wma decoder
- fix mmx macro
- remove changes from fdct_mmx.c (it should work fine now with the mmx macro fix)
CVS patchset: 3234
CVS date: 2002/11/11 13:45:34
Diffstat (limited to 'src/libffmpeg/libavcodec/ratecontrol.c')
| -rw-r--r-- | src/libffmpeg/libavcodec/ratecontrol.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/libffmpeg/libavcodec/ratecontrol.c b/src/libffmpeg/libavcodec/ratecontrol.c index 99e46dbad..870cd21e3 100644 --- a/src/libffmpeg/libavcodec/ratecontrol.c +++ b/src/libffmpeg/libavcodec/ratecontrol.c @@ -405,7 +405,7 @@ static double modify_qscale(MpegEncContext *s, RateControlEntry *rce, double q, else if(d<0.0001) d=0.0001; q*= pow(d, 1.0/s->avctx->rc_buffer_aggressivity); - q= MIN(q, bits2qp(rce, MAX((min_rate - buffer_size + rcc->buffer_index)*2, 1))); + q= FFMIN(q, bits2qp(rce, FFMAX((min_rate - buffer_size + rcc->buffer_index)*2, 1))); } if(max_rate){ @@ -414,7 +414,7 @@ static double modify_qscale(MpegEncContext *s, RateControlEntry *rce, double q, else if(d<0.0001) d=0.0001; q/= pow(d, 1.0/s->avctx->rc_buffer_aggressivity); - q= MAX(q, bits2qp(rce, MAX(rcc->buffer_index/2, 1))); + q= FFMAX(q, bits2qp(rce, FFMAX(rcc->buffer_index/2, 1))); } } //printf("q:%f max:%f min:%f size:%f index:%d bits:%f agr:%f\n", q,max_rate, min_rate, buffer_size, rcc->buffer_index, bits, s->avctx->rc_buffer_aggressivity); |