Revision e2158da8

View differences:

libavcodec/snow.c
2051 2051
    s->m.mb_stride=2;
2052 2052
    s->m.mb_x=
2053 2053
    s->m.mb_y= 0;
2054
    s->m.me.skip= 0;
2054
    c->skip= 0;
2055 2055

  
2056
    assert(s->m.me.  stride ==   stride);
2057
    assert(s->m.me.uvstride == uvstride);
2056
    assert(c->  stride ==   stride);
2057
    assert(c->uvstride == uvstride);
2058 2058

  
2059 2059
    c->penalty_factor    = get_penalty_factor(s->lambda, s->lambda2, c->avctx->me_cmp);
2060 2060
    c->sub_penalty_factor= get_penalty_factor(s->lambda, s->lambda2, c->avctx->me_sub_cmp);
......
2098 2098
        assert(ref_my >= c->ymin);
2099 2099
        assert(ref_my <= c->ymax);
2100 2100

  
2101
        ref_score= s->m.me.sub_motion_search(&s->m, &ref_mx, &ref_my, ref_score, 0, 0, level-LOG2_MB_SIZE+4, block_w);
2101
        ref_score= c->sub_motion_search(&s->m, &ref_mx, &ref_my, ref_score, 0, 0, level-LOG2_MB_SIZE+4, block_w);
2102 2102
        ref_score= ff_get_mb_score(&s->m, ref_mx, ref_my, 0, 0, level-LOG2_MB_SIZE+4, block_w, 0);
2103 2103
        ref_score+= 2*av_log2(2*ref)*c->penalty_factor;
2104 2104
        if(s->ref_mvs[ref]){

Also available in: Unified diff