Revision a1ce6110

View differences:

libavcodec/i386/h264dsp_mmx.c
370 370
        "paddusb %%mm6              , %%mm2 \n\t"
371 371

  
372 372
// in: mm0=p1 mm1=p0 mm2=q0 mm3=q1 mm7=(tc&mask) %8=mm_bone
373
// out: (q1addr) = clip( (q2+((p0+q0+1)>>1))>>1, q1-tc0, q1+tc0 )
373
// out: (q1addr) = av_clip( (q2+((p0+q0+1)>>1))>>1, q1-tc0, q1+tc0 )
374 374
// clobbers: q2, tmp, tc0
375 375
#define H264_DEBLOCK_Q1(p1, q2, q2addr, q1addr, tc0, tmp)\
376 376
        "movq     %%mm1,  "#tmp"   \n\t"\
libavcodec/sh4/qpel.c
449 449
                                           + src[index+stride+1]*   frac_x )*   frac_y
450 450
                                        + r)>>(shift*2);
451 451
                }else{
452
                    index= src_x + clip(src_y, 0, height)*stride;
452
                    index= src_x + av_clip(src_y, 0, height)*stride;
453 453
                    dst[y*stride + x]= ( (  src[index         ]*(s-frac_x)
454 454
                                          + src[index       +1]*   frac_x )*s
455 455
                                        + r)>>(shift*2);
456 456
                }
457 457
            }else{
458 458
                if((unsigned)src_y < height){
459
                    index= clip(src_x, 0, width) + src_y*stride;
459
                    index= av_clip(src_x, 0, width) + src_y*stride;
460 460
                    dst[y*stride + x]= (  (  src[index         ]*(s-frac_y)
461 461
                                           + src[index+stride  ]*   frac_y )*s
462 462
                                        + r)>>(shift*2);
463 463
                }else{
464
                    index= clip(src_x, 0, width) + clip(src_y, 0, height)*stride;
464
                    index= av_clip(src_x, 0, width) + av_clip(src_y, 0, height)*stride;
465 465
                    dst[y*stride + x]=    src[index         ];
466 466
                }
467 467
            }

Also available in: Unified diff