comparison mpeg12.c @ 10594:73779b8e6c5f libavcodec

Restructure dummy frame allocation. New code also allocates a dummy frame for an p field after an i field, previously that could segfault due to reading from NULL+x.

10593:46cb472ecc1e

                last_code= SLICE_MIN_START_CODE;

                if(s2->last_picture_ptr==NULL){
                /* Skip B-frames if we do not have reference frames and gop is not closed */
                    if(s2->pict_type==FF_B_TYPE){
                        int i;
                        if(!s2->closed_gop)
                            break;
                        /* Allocate a dummy frame */
                        i= ff_find_unused_picture(s2, 0);
                        s2->last_picture_ptr= &s2->picture[i];
                        if(ff_alloc_picture(s2, s2->last_picture_ptr, 0) < 0)
                            return -1;
                    }
                }
                if(s2->next_picture_ptr==NULL){
                /* Skip P-frames if we do not have a reference frame or we have an invalid header. */
                    if(s2->pict_type==FF_P_TYPE && (s2->first_field || s2->picture_structure==PICT_FRAME)) break;

                        return -1;
                }
                if(!s2->current_picture_ptr){
                    av_log(avctx, AV_LOG_ERROR, "current_picture not initialized\n");
                    return -1;
                }

                if (avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) {
                    s->slice_count++;
                    break;

10594:73779b8e6c5f

                last_code= SLICE_MIN_START_CODE;

                if(s2->last_picture_ptr==NULL){
                /* Skip B-frames if we do not have reference frames and gop is not closed */
                    if(s2->pict_type==FF_B_TYPE){
                        if(!s2->closed_gop)
                            break;
                    }
                }
                if(s2->next_picture_ptr==NULL){
                /* Skip P-frames if we do not have a reference frame or we have an invalid header. */
                    if(s2->pict_type==FF_P_TYPE && (s2->first_field || s2->picture_structure==PICT_FRAME)) break;

                        return -1;
                }
                if(!s2->current_picture_ptr){
                    av_log(avctx, AV_LOG_ERROR, "current_picture not initialized\n");
                    return -1;
                }

                if(s2->last_picture_ptr==NULL && s2->pict_type!=FF_I_TYPE){
                    int i;
                    /* Allocate a dummy frame */
                    i= ff_find_unused_picture(s2, 0);
                    s2->last_picture_ptr= &s2->picture[i];
                    if(ff_alloc_picture(s2, s2->last_picture_ptr, 0) < 0)
                        return -1;
                    s2->last_picture= *s2->last_picture_ptr;
                }
                if(s2->next_picture_ptr==NULL && s2->pict_type==FF_B_TYPE){
                    int i;
                    /* Allocate a dummy frame */
                    i= ff_find_unused_picture(s2, 0);
                    s2->next_picture_ptr= &s2->picture[i];
                    if(ff_alloc_picture(s2, s2->next_picture_ptr, 0) < 0)
                        return -1;
                    s2->next_picture= *s2->next_picture_ptr;
                }

                if (avctx->codec->capabilities&CODEC_CAP_HWACCEL_VDPAU) {
                    s->slice_count++;
                    break;