comparison mpegvideo.c @ 2364:f8a229dfa2e8 libavcodec

check num_entries too to avoid reading over the array end and dont check i>0 it must be >0 there

2363:e0bda0b8359a

            int b_frames;
            
            if(s->flags&CODEC_FLAG_PASS2){
                for(i=0; i<s->max_b_frames+1; i++){
                    int pict_num= s->input_picture[0]->display_picture_number + i;
                    int pict_type= s->rc_context.entry[pict_num].new_pict_type;

                    if(!s->input_picture[i]){
                        if(i>0)
                            s->rc_context.entry[pict_num-1].new_pict_type = P_TYPE;
                        break;
                    }
                    s->input_picture[i]->pict_type= pict_type;
                    
                    if(i + 1 >= s->rc_context.num_entries) break;
                }
            }

            if(s->avctx->b_frame_strategy==0){
                b_frames= s->max_b_frames;

2364:f8a229dfa2e8

            int b_frames;
            
            if(s->flags&CODEC_FLAG_PASS2){
                for(i=0; i<s->max_b_frames+1; i++){
                    int pict_num= s->input_picture[0]->display_picture_number + i;

                    if(pict_num >= s->rc_context.num_entries) 
                        break;
                    if(!s->input_picture[i]){
                        s->rc_context.entry[pict_num-1].new_pict_type = P_TYPE;
                        break;
                    }

                    s->input_picture[i]->pict_type= 
                        s->rc_context.entry[pict_num].new_pict_type;
                }
            }

            if(s->avctx->b_frame_strategy==0){
                b_frames= s->max_b_frames;