Mercurial > libavcodec.hg

diff h263.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 f5f2e162331c
children eacc2dd8fd9d
line wrap: on
line diff
--- a/h263.c	Sun Nov 10 11:24:27 2002 +0000
+++ b/h263.c	Sun Nov 10 11:46:59 2002 +0000
@@ -2204,7 +2204,7 @@
         case S_TYPE:
             return s->f_code+15;
         case B_TYPE:
-            return MAX(MAX(s->f_code, s->b_code)+15, 17);
+            return FFMAX(FFMAX(s->f_code, s->b_code)+15, 17);
         default:
             return -1;
     }
@@ -3981,7 +3981,7 @@
             s->sprite_shift[1]= alpha+rho+2;
             break;
         case 3:
-            min_ab= MIN(alpha, beta);
+            min_ab= FFMIN(alpha, beta);
             w3= w2>>min_ab;
             h3= h2>>min_ab;
             s->sprite_offset[0][0]=  (sprite_ref[0][0]<<(alpha+beta+rho-min_ab))