Revision 755bfeab libavcodec/motion_est.c

View differences:

libavcodec/motion_est.c
279 279
        c->uvstride=  8*s->mb_width + 16;
280 280
    }
281 281

  
282
    // 8x8 fullpel search would need a 4x4 chroma compare, which we dont have yet, and even if we had the motion estimation code doesnt expect it
282
    /* 8x8 fullpel search would need a 4x4 chroma compare, which we do
283
     * not have yet, and even if we had, the motion estimation code
284
     * does not expect it. */
283 285
    if(s->codec_id != CODEC_ID_SNOW){
284 286
        if((c->avctx->me_cmp&FF_CMP_CHROMA)/* && !s->dsp.me_cmp[2]*/){
285 287
            s->dsp.me_cmp[2]= zero_cmp;
......
1980 1982
            type |= CANDIDATE_MB_TYPE_BIDIR_I;
1981 1983
        }
1982 1984
         //FIXME something smarter
1983
        if(dmin>256*256*16) type&= ~CANDIDATE_MB_TYPE_DIRECT; //dont try direct mode if its invalid for this MB
1985
        if(dmin>256*256*16) type&= ~CANDIDATE_MB_TYPE_DIRECT; //do not try direct mode if it is invalid for this MB
1984 1986
        if(s->codec_id == CODEC_ID_MPEG4 && type&CANDIDATE_MB_TYPE_DIRECT && s->flags&CODEC_FLAG_MV0 && *(uint32_t*)s->b_direct_mv_table[xy])
1985 1987
            type |= CANDIDATE_MB_TYPE_DIRECT0;
1986 1988
#if 0

Also available in: Unified diff