har0ke/FFmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

keep decoding nal units after an error

Browse Source 
Originally committed as revision 4399 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Michael Niedermayer 2005-06-27 09:37:16 +00:00
parent d926e8c5c3
commit 3d15acf27b
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
libavcodec/h264.c
View File

@ -7222,7 +7222,10 @@ static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){
h->inter_gb_ptr= &s->gb; h->inter_gb_ptr= &s->gb;
s->data_partitioning = 0; s->data_partitioning = 0;
if(decode_slice_header(h) < 0) return -1; if(decode_slice_header(h) < 0){
av_log(h->s.avctx, AV_LOG_ERROR, "decode_slice_header error\n");
break;
}
if(h->redundant_pic_count==0 && s->hurry_up < 5 ) if(h->redundant_pic_count==0 && s->hurry_up < 5 )
decode_slice(h); decode_slice(h);
break; break;
@ -7232,7 +7235,9 @@ static int decode_nal_units(H264Context *h, uint8_t *buf, int buf_size){
h->inter_gb_ptr= NULL; h->inter_gb_ptr= NULL;
s->data_partitioning = 1; s->data_partitioning = 1;
if(decode_slice_header(h) < 0) return -1; if(decode_slice_header(h) < 0){
av_log(h->s.avctx, AV_LOG_ERROR, "decode_slice_header error\n");
}
break; break;
case NAL_DPB: case NAL_DPB:
init_get_bits(&h->intra_gb, ptr, bit_length); init_get_bits(&h->intra_gb, ptr, bit_length);