comparison mpeg12.c @ 10606:9ea5f2f1874f libavcodec

Move dummy picture allocation code from mpeg1/2 to mpegvideo. This fixes a infinite loop on a b frame.

10605:2c2827f792a1

                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;
                }

10606:9ea5f2f1874f

                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;
                }