Revision 1545acea libavcodec/motion_est.c

View differences:

libavcodec/motion_est.c
1002 1002
        c->stride<<=1;
1003 1003
        c->uvstride<<=1;
1004 1004
        
1005
        assert(s->flags & CODEC_FLAG_INTERLACED_ME);
1005
        if(!(s->flags & CODEC_FLAG_INTERLACED_ME)){
1006
            av_log(s->avctx, AV_LOG_ERROR, "Interlaced macroblock selected but interlaced motion estimation disabled\n");
1007
            return -1;
1008
        }
1006 1009

  
1007 1010
        if(USES_LIST(mb_type, 0)){
1008 1011
            int field_select0= p->ref_index[0][xy ];
......
1060 1063
        c->stride>>=1;
1061 1064
        c->uvstride>>=1;
1062 1065
    }else if(IS_8X8(mb_type)){
1063
        assert(s->flags & CODEC_FLAG_4MV);
1066
        if(!(s->flags & CODEC_FLAG_4MV)){
1067
            av_log(s->avctx, AV_LOG_ERROR, "4MV macroblock selected but 4MV encoding disabled\n");
1068
            return -1;
1069
        }
1064 1070
        cmpf= s->dsp.sse[1];
1065 1071
        chroma_cmpf= s->dsp.sse[1];
1066 1072
        init_mv4_ref(s);

Also available in: Unified diff