comparison mpeg12.c @ 1182:38e8b8f331cb libavcodec

some checks to avoid segfaults if the decoder is feeded with junk

1181:4c2339f3863a

                 s->intra_dc_precision, s->picture_structure, s->frame_pred_frame_dct, s->concealment_motion_vectors,
                 s->q_scale_type, s->intra_vlc_format, s->repeat_first_field, s->chroma_420_type ? "420" :"");
        }
      }else{ //second field
            int i;
            for(i=0; i<4; i++){
                s->current_picture.data[i] = s->current_picture_ptr->data[i];
                if(s->picture_structure == PICT_BOTTOM_FIELD){
                    s->current_picture.data[i] += s->current_picture_ptr->linesize[i];
                } 

                        /* skip b frames if we are in a hurry */
                        if(avctx->hurry_up && s2->pict_type==B_TYPE) break;
                        /* skip everything if we are in a hurry>=5 */
                        if(avctx->hurry_up>=5) break;

                        ret = mpeg_decode_slice(avctx, picture,
                                                start_code, s->buffer, input_size);

                        if (ret == DECODE_SLICE_EOP) {
                            *data_size = sizeof(AVPicture);

1182:38e8b8f331cb

                 s->intra_dc_precision, s->picture_structure, s->frame_pred_frame_dct, s->concealment_motion_vectors,
                 s->q_scale_type, s->intra_vlc_format, s->repeat_first_field, s->chroma_420_type ? "420" :"");
        }
      }else{ //second field
            int i;
            
            if(!s->current_picture_ptr){
                fprintf(stderr, "first field missing\n");
                return -1;
            }
            
            for(i=0; i<4; i++){
                s->current_picture.data[i] = s->current_picture_ptr->data[i];
                if(s->picture_structure == PICT_BOTTOM_FIELD){
                    s->current_picture.data[i] += s->current_picture_ptr->linesize[i];
                } 

                        /* skip b frames if we are in a hurry */
                        if(avctx->hurry_up && s2->pict_type==B_TYPE) break;
                        /* skip everything if we are in a hurry>=5 */
                        if(avctx->hurry_up>=5) break;

                        if (!s->mpeg_enc_ctx_allocated) break;

                        ret = mpeg_decode_slice(avctx, picture,
                                                start_code, s->buffer, input_size);

                        if (ret == DECODE_SLICE_EOP) {
                            *data_size = sizeof(AVPicture);