Revision f66e4f5f libavcodec/vp6.c

View differences:

libavcodec/vp6.c
236 236
    for (pt=0; pt<2; pt++)
237 237
        for (ctx=0; ctx<3; ctx++)
238 238
            for (node=0; node<5; node++)
239
                s->coeff_model_dcct[pt][ctx][node] = clip(((s->coeff_model_dccv[pt][node] * vp6_dccv_lc[ctx][node][0] + 128) >> 8) + vp6_dccv_lc[ctx][node][1], 1, 255);
239
                s->coeff_model_dcct[pt][ctx][node] = av_clip(((s->coeff_model_dccv[pt][node] * vp6_dccv_lc[ctx][node][0] + 128) >> 8) + vp6_dccv_lc[ctx][node][1], 1, 255);
240 240
}
241 241

  
242 242
static void vp6_parse_vector_adjustment(vp56_context_t *s, vp56_mv_t *vect)
......
395 395

  
396 396
    for (y=0; y<8; y++) {
397 397
        for (x=0; x<8; x++) {
398
            dst[x] = clip_uint8((  src[x-delta  ] * weights[0]
398
            dst[x] = av_clip_uint8((  src[x-delta  ] * weights[0]
399 399
                                 + src[x        ] * weights[1]
400 400
                                 + src[x+delta  ] * weights[2]
401 401
                                 + src[x+2*delta] * weights[3] + 64) >> 7);
......
434 434

  
435 435
    for (y=0; y<11; y++) {
436 436
        for (x=0; x<8; x++) {
437
            t[x] = clip_uint8((  src[x-1] * h_weights[0]
437
            t[x] = av_clip_uint8((  src[x-1] * h_weights[0]
438 438
                               + src[x  ] * h_weights[1]
439 439
                               + src[x+1] * h_weights[2]
440 440
                               + src[x+2] * h_weights[3] + 64) >> 7);
......
446 446
    t = tmp + 8;
447 447
    for (y=0; y<8; y++) {
448 448
        for (x=0; x<8; x++) {
449
            dst[x] = clip_uint8((  t[x-8 ] * v_weights[0]
449
            dst[x] = av_clip_uint8((  t[x-8 ] * v_weights[0]
450 450
                                 + t[x   ] * v_weights[1]
451 451
                                 + t[x+8 ] * v_weights[2]
452 452
                                 + t[x+16] * v_weights[3] + 64) >> 7);

Also available in: Unified diff