comparison mpegvideo.c @ 1393:ba99a78bcb37 libavcodec

make the h263 decoder more error tolerant

1392:13a02518ffb6

    
    if(s->last_picture_ptr) s->last_picture= *s->last_picture_ptr;
    if(s->next_picture_ptr) s->next_picture= *s->next_picture_ptr;
    if(s->new_picture_ptr ) s->new_picture = *s->new_picture_ptr;
    
    if(s->picture_structure!=PICT_FRAME){
        int i;
        for(i=0; i<4; i++){
            if(s->picture_structure == PICT_BOTTOM_FIELD){
                 s->current_picture.data[i] += s->current_picture.linesize[i];
            } 
            s->current_picture.linesize[i] *= 2;
            s->last_picture.linesize[i] *=2;
            s->next_picture.linesize[i] *=2;
        }
    }
    
    if(s->pict_type != I_TYPE && s->last_picture_ptr==NULL){
        fprintf(stderr, "warning: first frame is no keyframe\n");
        assert(s->pict_type != B_TYPE); //these should have been dropped if we dont have a reference
        goto alloc;
    }
  }
   
    s->hurry_up= s->avctx->hurry_up;
    s->error_resilience= avctx->error_resilience;

1393:ba99a78bcb37

    
    if(s->last_picture_ptr) s->last_picture= *s->last_picture_ptr;
    if(s->next_picture_ptr) s->next_picture= *s->next_picture_ptr;
    if(s->new_picture_ptr ) s->new_picture = *s->new_picture_ptr;
    
    if(s->pict_type != I_TYPE && s->last_picture_ptr==NULL){
        fprintf(stderr, "warning: first frame is no keyframe\n");
        assert(s->pict_type != B_TYPE); //these should have been dropped if we dont have a reference
        goto alloc;
    }

    assert(s->pict_type == I_TYPE || (s->last_picture_ptr && s->last_picture_ptr->data[0]));

    if(s->picture_structure!=PICT_FRAME){
        int i;
        for(i=0; i<4; i++){
            if(s->picture_structure == PICT_BOTTOM_FIELD){
                 s->current_picture.data[i] += s->current_picture.linesize[i];
            } 
            s->current_picture.linesize[i] *= 2;
            s->last_picture.linesize[i] *=2;
            s->next_picture.linesize[i] *=2;
        }
    }
  }
   
    s->hurry_up= s->avctx->hurry_up;
    s->error_resilience= avctx->error_resilience;