Mercurial > libavcodec.hg

diff wmv2.c @ 4594:a96d905dcbaa libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Add av_ prefix to clip functions
author reimar
date Sun, 25 Feb 2007 10:27:12 +0000
parents 018b316baca7
children 6a4e8b52dc7b
line wrap: on
line diff
--- a/wmv2.c	Sun Feb 25 07:53:44 2007 +0000
+++ b/wmv2.c	Sun Feb 25 10:27:12 2007 +0000
@@ -641,8 +641,8 @@
 
     /* WARNING: do no forget half pels */
     v_edge_pos = s->v_edge_pos;
-    src_x = clip(src_x, -16, s->width);
-    src_y = clip(src_y, -16, s->height);
+    src_x = av_clip(src_x, -16, s->width);
+    src_y = av_clip(src_y, -16, s->height);
 
     if(src_x<=-16 || src_x >= s->width)
         dxy &= ~3;
@@ -688,10 +688,10 @@
 
     src_x = s->mb_x * 8 + mx;
     src_y = s->mb_y * 8 + my;
-    src_x = clip(src_x, -8, s->width >> 1);
+    src_x = av_clip(src_x, -8, s->width >> 1);
     if (src_x == (s->width >> 1))
         dxy &= ~1;
-    src_y = clip(src_y, -8, s->height >> 1);
+    src_y = av_clip(src_y, -8, s->height >> 1);
     if (src_y == (s->height >> 1))
         dxy &= ~2;
     offset = (src_y * uvlinesize) + src_x;