comparison mpegvideo.c @ 1214:327c5a36dfe7 libavcodec

fixing mixed dr1 + internal buffers

1213:a71fe70b428b

    pic->mb_type= NULL;
    for(i=0; i<2; i++){
        av_freep(&pic->motion_val[i]);
        av_freep(&pic->ref_index[i]);
    }

    if(pic->type == FF_BUFFER_TYPE_INTERNAL){
        for(i=0; i<4; i++){
            av_freep(&pic->base[i]);
            pic->data[i]= NULL;
        }
        av_freep(&pic->opaque);
        pic->type= 0;
    }else if(pic->type == FF_BUFFER_TYPE_SHARED){
        for(i=0; i<4; i++){
            pic->base[i]=
            pic->data[i]= NULL;
        }
        pic->type= 0;        

    av_freep(&s->mb_index2xy);

    for(i=0; i<MAX_PICTURE_COUNT; i++){
        free_picture(s, &s->picture[i]);
    }
    s->context_initialized = 0;
}

#ifdef CONFIG_ENCODERS

  if(s->out_format != FMT_H264){
    if (s->pict_type != B_TYPE) {
        s->last_picture_ptr= s->next_picture_ptr;
        s->next_picture_ptr= s->current_picture_ptr;
    }
    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){

1214:327c5a36dfe7

    pic->mb_type= NULL;
    for(i=0; i<2; i++){
        av_freep(&pic->motion_val[i]);
        av_freep(&pic->ref_index[i]);
    }
    
    if(pic->type == FF_BUFFER_TYPE_SHARED){
        for(i=0; i<4; i++){
            pic->base[i]=
            pic->data[i]= NULL;
        }
        pic->type= 0;        

    av_freep(&s->mb_index2xy);

    for(i=0; i<MAX_PICTURE_COUNT; i++){
        free_picture(s, &s->picture[i]);
    }
    avcodec_default_free_buffers(s->avctx);
    s->context_initialized = 0;
}

#ifdef CONFIG_ENCODERS

  if(s->out_format != FMT_H264){
    if (s->pict_type != B_TYPE) {
        s->last_picture_ptr= s->next_picture_ptr;
        s->next_picture_ptr= s->current_picture_ptr;
    }
    
    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){