Fix parts missed in clip -> av_clip rename
authorReimar Döffinger <Reimar.Doeffinger@gmx.de>
Thu, 19 Apr 2007 16:12:06 +0000 (16:12 +0000)
committerReimar Döffinger <Reimar.Doeffinger@gmx.de>
Thu, 19 Apr 2007 16:12:06 +0000 (16:12 +0000)
Originally committed as revision 8760 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/i386/h264dsp_mmx.c
libavcodec/sh4/qpel.c

index 56004b674d072c1d688f2b008db36603819d2e3c..2cead03615d8d5abb725d913eef4308dd4e60fe8 100644 (file)
@@ -370,7 +370,7 @@ static void ff_h264_idct8_dc_add_mmx2(uint8_t *dst, int16_t *block, int stride)
         "paddusb %%mm6              , %%mm2 \n\t"
 
 // in: mm0=p1 mm1=p0 mm2=q0 mm3=q1 mm7=(tc&mask) %8=mm_bone
-// out: (q1addr) = clip( (q2+((p0+q0+1)>>1))>>1, q1-tc0, q1+tc0 )
+// out: (q1addr) = av_clip( (q2+((p0+q0+1)>>1))>>1, q1-tc0, q1+tc0 )
 // clobbers: q2, tmp, tc0
 #define H264_DEBLOCK_Q1(p1, q2, q2addr, q1addr, tc0, tmp)\
         "movq     %%mm1,  "#tmp"   \n\t"\
index 7a73ac50da0659993dea47304b4d4debcc2fc695..b3c418a9e1eb05c67c98a71c80a27f3e36d374f8 100644 (file)
@@ -449,19 +449,19 @@ static void gmc_c(uint8_t *dst, uint8_t *src, int stride, int h, int ox, int oy,
                                            + src[index+stride+1]*   frac_x )*   frac_y
                                         + r)>>(shift*2);
                 }else{
-                    index= src_x + clip(src_y, 0, height)*stride;
+                    index= src_x + av_clip(src_y, 0, height)*stride;
                     dst[y*stride + x]= ( (  src[index         ]*(s-frac_x)
                                           + src[index       +1]*   frac_x )*s
                                         + r)>>(shift*2);
                 }
             }else{
                 if((unsigned)src_y < height){
-                    index= clip(src_x, 0, width) + src_y*stride;
+                    index= av_clip(src_x, 0, width) + src_y*stride;
                     dst[y*stride + x]= (  (  src[index         ]*(s-frac_y)
                                            + src[index+stride  ]*   frac_y )*s
                                         + r)>>(shift*2);
                 }else{
-                    index= clip(src_x, 0, width) + clip(src_y, 0, height)*stride;
+                    index= av_clip(src_x, 0, width) + av_clip(src_y, 0, height)*stride;
                     dst[y*stride + x]=    src[index         ];
                 }
             }