RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

avcodec/h264_refs: Allow slightly larger pps_ref_count[0] in PAFF RAP detection heuristic 

Fixes Ticket4738

Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
This commit is contained in:
Michael Niedermayer 2015-07-29 03:03:52 +02:00
parent 0a6aa30f7c
commit 9ec17e45b2
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libavcodec/h264_refs.c
View File

@ -810,7 +810,8 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count)
if ( err >= 0 if ( err >= 0
&& h->long_ref_count==0 && h->long_ref_count==0
&& (h->short_ref_count<=2 || pps_ref_count[0] <= 1 && pps_ref_count[1] <= 1) && ( h->short_ref_count<=2
|| pps_ref_count[0] <= 1 + (h->picture_structure != PICT_FRAME) && pps_ref_count[1] <= 1)
&& pps_ref_count[0]<=2 + (h->picture_structure != PICT_FRAME) + (2*!h->has_recovery_point) && pps_ref_count[0]<=2 + (h->picture_structure != PICT_FRAME) + (2*!h->has_recovery_point)
&& h->cur_pic_ptr->f->pict_type == AV_PICTURE_TYPE_I){ && h->cur_pic_ptr->f->pict_type == AV_PICTURE_TYPE_I){
h->cur_pic_ptr->recovered |= 1; h->cur_pic_ptr->recovered |= 1;