virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

some checks to avoid segfault

Browse Source 
Originally committed as revision 1740 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2003-04-07 19:23:21 +00:00
parent 9f2e61b6a3
commit 8b92b792d1
1 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
libavcodec/h264.c
View File

@ -2826,7 +2826,16 @@ static int decode_slice_header(H264Context *h){
return -1; return -1;
} }
h->pps= h->pps_buffer[pps_id]; h->pps= h->pps_buffer[pps_id];
if(h->pps.slice_group_count == 0){
fprintf(stderr, "non existing PPS referenced\n");
return -1;
}
h->sps= h->sps_buffer[ h->pps.sps_id ]; h->sps= h->sps_buffer[ h->pps.sps_id ];
if(h->sps.log2_max_frame_num == 0){
fprintf(stderr, "non existing SPS referenced\n");
return -1;
}
s->mb_width= h->sps.mb_width; s->mb_width= h->sps.mb_width;
s->mb_height= h->sps.mb_height; s->mb_height= h->sps.mb_height;
@ -4035,8 +4044,8 @@ static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){
case NAL_DPC: case NAL_DPC:
init_get_bits(&h->inter_gb, ptr, bit_length); init_get_bits(&h->inter_gb, ptr, bit_length);
h->inter_gb_ptr= &h->inter_gb; h->inter_gb_ptr= &h->inter_gb;
if(h->redundant_pic_count==0) if(h->redundant_pic_count==0 && h->intra_gb_ptr && s->data_partitioning)
decode_slice(h); decode_slice(h);
break; break;
case NAL_SEI: case NAL_SEI:
@ -4067,6 +4076,8 @@ static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){
s->current_picture.key_frame= s->pict_type == I_TYPE; s->current_picture.key_frame= s->pict_type == I_TYPE;
} }
if(!s->current_picture_ptr) return buf_index; //no frame
h->prev_frame_num_offset= h->frame_num_offset; h->prev_frame_num_offset= h->frame_num_offset;
h->prev_frame_num= h->frame_num; h->prev_frame_num= h->frame_num;
if(s->current_picture_ptr->reference){ if(s->current_picture_ptr->reference){
@ -4147,21 +4158,14 @@ static int decode_frame(AVCodecContext *avctx,
*pict= *(AVFrame*)&s->last_picture; *pict= *(AVFrame*)&s->last_picture;
} }
#endif #endif
if(!s->current_picture_ptr){
fprintf(stderr, "error, NO frame\n");
return -1;
}
*pict= *(AVFrame*)&s->current_picture; //FIXME *pict= *(AVFrame*)&s->current_picture; //FIXME
assert(pict->data[0]); assert(pict->data[0]);
//printf("out %d\n", (int)pict->data[0]); //printf("out %d\n", (int)pict->data[0]);
if(avctx->debug&FF_DEBUG_QP){
int8_t *qtab= pict->qscale_table;
int x,y;
for(y=0; y<s->mb_height; y++){
for(x=0; x<s->mb_width; x++){
printf("%2d ", qtab[x + y*s->mb_width]);
}
printf("\n");
}
printf("\n");
}
#if 0 //? #if 0 //?
/* Return the Picture timestamp as the frame number */ /* Return the Picture timestamp as the frame number */