diff options
| author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-29 03:03:52 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-29 03:03:52 +0200 |
| commit | 9ec17e45b28ab200d637ae2af772cbfdfd1266e9 (patch) | |
| tree | 72e5dcf862b13cc0eaad728c387d37065633acfe | |
| parent | 0a6aa30f7c05d9032900311158f733b7376b9499 (diff) | |
| download | ffmpeg-9ec17e45b28ab200d637ae2af772cbfdfd1266e9.tar.gz | |
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>
| -rw-r--r-- | libavcodec/h264_refs.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c index 9d56fbf17d..619f2edf84 100644 --- a/libavcodec/h264_refs.c +++ b/libavcodec/h264_refs.c @@ -810,7 +810,8 @@ int ff_h264_execute_ref_pic_marking(H264Context *h, MMCO *mmco, int mmco_count) if ( err >= 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) && h->cur_pic_ptr->f->pict_type == AV_PICTURE_TYPE_I){ h->cur_pic_ptr->recovered |= 1; |