Mercurial > libavcodec.hg
changeset 4866:6c66ddbb054f libavcodec
Fix parts missed in clip -> av_clip rename
| author | reimar |
|---|---|
| date | Thu, 19 Apr 2007 16:12:06 +0000 |
| parents | 086291824752 |
| children | 97d82c7585b4 |
| files | i386/h264dsp_mmx.c sh4/qpel.c |
| diffstat | 2 files changed, 4 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/i386/h264dsp_mmx.c Wed Apr 18 19:58:20 2007 +0000 +++ b/i386/h264dsp_mmx.c Thu Apr 19 16:12:06 2007 +0000 @@ -370,7 +370,7 @@ "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"\
--- a/sh4/qpel.c Wed Apr 18 19:58:20 2007 +0000 +++ b/sh4/qpel.c Thu Apr 19 16:12:06 2007 +0000 @@ -449,19 +449,19 @@ + 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 ]; } }