diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2002-11-10 11:46:59 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2002-11-10 11:46:59 +0000 |
| commit | b8a78f419dd67cebc70f78e3d183c7eb4ed10c0e (patch) | |
| tree | f502064c04d45369a01aa2722ac173b80301b8d3 /libavcodec/ratecontrol.c | |
| parent | f11d3f23105f8c7e195990ab2c1728d3dd2f206f (diff) | |
reversing header game
MIN/MAX -> FFMIN/FFMAX
Originally committed as revision 1184 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/ratecontrol.c')
| -rw-r--r-- | libavcodec/ratecontrol.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index 99e46dbad2..870cd21e32 100644 --- a/libavcodec/ratecontrol.c +++ b/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); |