Mercurial > libavcodec.hg

diff ratecontrol.c @ 847:f3c369b8ddca libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
reversing header game MIN/MAX -> FFMIN/FFMAX
author michaelni
date Sun, 10 Nov 2002 11:46:59 +0000
parents 07e58dc635a5
children 22ee74da2cd3
line wrap: on
line diff
--- a/ratecontrol.c	Sun Nov 10 11:24:27 2002 +0000
+++ b/ratecontrol.c	Sun Nov 10 11:46:59 2002 +0000
@@ -405,7 +405,7 @@
             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 @@
             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);