[Ffmpeg-cvslog] r8760 - in trunk/libavcodec: i386/h264dsp_mmx.c sh4/qpel.c
reimar
subversion
Thu Apr 19 18:12:07 CEST 2007
Author: reimar
Date: Thu Apr 19 18:12:06 2007
New Revision: 8760
Modified:
trunk/libavcodec/i386/h264dsp_mmx.c
trunk/libavcodec/sh4/qpel.c
Log:
Fix parts missed in clip -> av_clip rename
Modified: trunk/libavcodec/i386/h264dsp_mmx.c
==============================================================================
--- trunk/libavcodec/i386/h264dsp_mmx.c (original)
+++ trunk/libavcodec/i386/h264dsp_mmx.c Thu Apr 19 18:12:06 2007
@@ -370,7 +370,7 @@ static void ff_h264_idct8_dc_add_mmx2(ui
"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"\
Modified: trunk/libavcodec/sh4/qpel.c
==============================================================================
--- trunk/libavcodec/sh4/qpel.c (original)
+++ trunk/libavcodec/sh4/qpel.c Thu Apr 19 18:12:06 2007
@@ -449,19 +449,19 @@ static void gmc_c(uint8_t *dst, uint8_t
+ 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 ];
}
}
More information about the ffmpeg-cvslog
mailing list