virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2025-01-13 21:28:01 +02:00
Code Issues Releases Activity

h264: factor "if(h->sei_recovery_frame_cnt >= 0)" out

Browse Source 
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2013-11-02 01:02:21 +01:00
parent f578e5d937
commit 647adc4290
1 changed files with 10 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libavcodec/h264.c
View File

@ -4845,17 +4845,18 @@ again:
if ((err = decode_slice_header(hx, h))) if ((err = decode_slice_header(hx, h)))
break; break;
if (h->sei_recovery_frame_cnt >= 0 && (h->frame_num != h->sei_recovery_frame_cnt || hx->slice_type_nos != AV_PICTURE_TYPE_I)) if (h->sei_recovery_frame_cnt >= 0) {
h->valid_recovery_point = 1; if (h->frame_num != h->sei_recovery_frame_cnt || hx->slice_type_nos != AV_PICTURE_TYPE_I)
h->valid_recovery_point = 1;
if ( h->sei_recovery_frame_cnt >= 0 if ( h->recovery_frame < 0
&& ( h->recovery_frame<0 || ((h->recovery_frame - h->frame_num) & ((1 << h->sps.log2_max_frame_num)-1)) > h->sei_recovery_frame_cnt) {
|| ((h->recovery_frame - h->frame_num) & ((1 << h->sps.log2_max_frame_num)-1)) > h->sei_recovery_frame_cnt)) { h->recovery_frame = (h->frame_num + h->sei_recovery_frame_cnt) &
h->recovery_frame = (h->frame_num + h->sei_recovery_frame_cnt) & ((1 << h->sps.log2_max_frame_num) - 1);
((1 << h->sps.log2_max_frame_num) - 1);
if (!h->valid_recovery_point) if (!h->valid_recovery_point)
h->recovery_frame = h->frame_num; h->recovery_frame = h->frame_num;
}
} }
h->cur_pic_ptr->f.key_frame |= h->cur_pic_ptr->f.key_frame |=