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

[Michael Niedermayer]

ffmpeg | branch: master | Michael Niedermayer <michael at niedermayer.cc> | Wed Jul 29 03:03:52 2015 +0200| [9ec17e45b28ab200d637ae2af772cbfdfd1266e9] | committer: Michael Niedermayer

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

Fixes Ticket4738

Signed-off-by: Michael Niedermayer <michael at niedermayer.cc>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=9ec17e45b28ab200d637ae2af772cbfdfd1266e9
---

 libavcodec/h264_refs.c |    3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c
index 9d56fbf..619f2ed 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;