Revision 2c19981a

View differences:

libavcodec/mpegvideo.c
2396 2396
            
2397 2397
        if(s->codec_id==CODEC_ID_MPEG4){        
2398 2398
            if(!s->mb_intra){
2399
                assert(s->dquant==0 || s->mv_type!=MV_TYPE_8X8);
2400

  
2401 2399
                if(s->mv_dir&MV_DIRECT)
2402 2400
                    s->dquant=0;
2401

  
2402
                assert(s->dquant==0 || s->mv_type!=MV_TYPE_8X8);
2403 2403
            }
2404 2404
        }
2405 2405
        s->qscale+= s->dquant;
libavcodec/utils.c
131 131
    DefaultPicOpaque *opaque;
132 132
    
133 133
    assert(pic->data[0]==NULL);
134
    assert(pic->type==0 || pic->type==FF_TYPE_INTERNAL);
134
    assert(pic->type==0 || pic->type==FF_BUFFER_TYPE_INTERNAL);
135 135

  
136 136
    if(pic->opaque){
137 137
        opaque= (DefaultPicOpaque *)pic->opaque;
......
181 181
        opaque->last_pic_num= -256*256*256*64;
182 182

  
183 183
        for(i=0; i<3; i++){
184
            int h_shift= i==0 ? 0 : h_chroma_shift;
185
            int v_shift= i==0 ? 0 : v_chroma_shift;
184
            const int h_shift= i==0 ? 0 : h_chroma_shift;
185
            const int v_shift= i==0 ? 0 : v_chroma_shift;
186 186

  
187 187
            pic->linesize[i]= pixel_size*w>>h_shift;
188 188

  

Also available in: Unified diff