Revision f66e4f5f libavcodec/wmv2.c

View differences:

libavcodec/wmv2.c
641 641

  
642 642
    /* WARNING: do no forget half pels */
643 643
    v_edge_pos = s->v_edge_pos;
644
    src_x = clip(src_x, -16, s->width);
645
    src_y = clip(src_y, -16, s->height);
644
    src_x = av_clip(src_x, -16, s->width);
645
    src_y = av_clip(src_y, -16, s->height);
646 646

  
647 647
    if(src_x<=-16 || src_x >= s->width)
648 648
        dxy &= ~3;
......
688 688

  
689 689
    src_x = s->mb_x * 8 + mx;
690 690
    src_y = s->mb_y * 8 + my;
691
    src_x = clip(src_x, -8, s->width >> 1);
691
    src_x = av_clip(src_x, -8, s->width >> 1);
692 692
    if (src_x == (s->width >> 1))
693 693
        dxy &= ~1;
694
    src_y = clip(src_y, -8, s->height >> 1);
694
    src_y = av_clip(src_y, -8, s->height >> 1);
695 695
    if (src_y == (s->height >> 1))
696 696
        dxy &= ~2;
697 697
    offset = (src_y * uvlinesize) + src_x;

Also available in: Unified diff