Commit a1ce6110 authored by Reimar Döffinger's avatar Reimar Döffinger

Fix parts missed in clip -> av_clip rename

Originally committed as revision 8760 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent b0b2faa7
...@@ -370,7 +370,7 @@ static void ff_h264_idct8_dc_add_mmx2(uint8_t *dst, int16_t *block, int stride) ...@@ -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" "paddusb %%mm6 , %%mm2 \n\t"
// in: mm0=p1 mm1=p0 mm2=q0 mm3=q1 mm7=(tc&mask) %8=mm_bone // 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 // clobbers: q2, tmp, tc0
#define H264_DEBLOCK_Q1(p1, q2, q2addr, q1addr, tc0, tmp)\ #define H264_DEBLOCK_Q1(p1, q2, q2addr, q1addr, tc0, tmp)\
"movq %%mm1, "#tmp" \n\t"\ "movq %%mm1, "#tmp" \n\t"\
......
...@@ -449,19 +449,19 @@ static void gmc_c(uint8_t *dst, uint8_t *src, int stride, int h, int ox, int oy, ...@@ -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 + src[index+stride+1]* frac_x )* frac_y
+ r)>>(shift*2); + r)>>(shift*2);
}else{ }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) dst[y*stride + x]= ( ( src[index ]*(s-frac_x)
+ src[index +1]* frac_x )*s + src[index +1]* frac_x )*s
+ r)>>(shift*2); + r)>>(shift*2);
} }
}else{ }else{
if((unsigned)src_y < height){ 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) dst[y*stride + x]= ( ( src[index ]*(s-frac_y)
+ src[index+stride ]* frac_y )*s + src[index+stride ]* frac_y )*s
+ r)>>(shift*2); + r)>>(shift*2);
}else{ }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 ]; dst[y*stride + x]= src[index ];
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment