diff jpeg_ls.c @ 4594:a96d905dcbaa libavcodec

Add av_ prefix to clip functions

--- a/jpeg_ls.c	Sun Feb 25 07:53:44 2007 +0000
+++ b/jpeg_ls.c	Sun Feb 25 10:27:12 2007 +0000
@@ -366,10 +366,10 @@
             }
 
             if(sign){
-                pred = clip(pred - state->C[context], 0, state->maxval);
+                pred = av_clip(pred - state->C[context], 0, state->maxval);
                 err = -ls_get_code_regular(&s->gb, state, context);
             } else {
-                pred = clip(pred + state->C[context], 0, state->maxval);
+                pred = av_clip(pred + state->C[context], 0, state->maxval);
                 err = ls_get_code_regular(&s->gb, state, context);
             }
 
@@ -381,7 +381,7 @@
                 pred += state->range * state->twonear;
             else if(pred > state->maxval + state->near)
                 pred -= state->range * state->twonear;
-            pred = clip(pred, 0, state->maxval);
+            pred = av_clip(pred, 0, state->maxval);
         }
 
         pred &= state->maxval;
@@ -623,9 +623,9 @@
                     err = -(state->near - err) / state->twonear;
 
                 if(RItype || (Rb >= Ra))
-                    Ra = clip(pred + err * state->twonear, 0, state->maxval);
+                    Ra = av_clip(pred + err * state->twonear, 0, state->maxval);
                 else
-                    Ra = clip(pred - err * state->twonear, 0, state->maxval);
+                    Ra = av_clip(pred - err * state->twonear, 0, state->maxval);
                 W(cur, x, Ra);
             }
             if(err < 0)
@@ -646,11 +646,11 @@
             if(context < 0){
                 context = -context;
                 sign = 1;
-                pred = clip(pred - state->C[context], 0, state->maxval);
+                pred = av_clip(pred - state->C[context], 0, state->maxval);
                 err = pred - R(cur, x);
             }else{
                 sign = 0;
-                pred = clip(pred + state->C[context], 0, state->maxval);
+                pred = av_clip(pred + state->C[context], 0, state->maxval);
                 err = R(cur, x) - pred;
             }
 
@@ -660,9 +660,9 @@
                 else
                     err = -(state->near - err) / state->twonear;
                 if(!sign)
-                    Ra = clip(pred + err * state->twonear, 0, state->maxval);
+                    Ra = av_clip(pred + err * state->twonear, 0, state->maxval);
                 else
-                    Ra = clip(pred - err * state->twonear, 0, state->maxval);
+                    Ra = av_clip(pred - err * state->twonear, 0, state->maxval);
                 W(cur, x, Ra);
             }