diff mbox

[FFmpeg-devel,1/2] avcodec/h264_refs: Detect more random access points which are not marked

Message ID 20180817000841.5569-1-michael@niedermayer.cc
State Accepted
Commit b544850a524f71dba9163d7b0606767ea2572412
Headers show

Commit Message

Michael Niedermayer Aug. 17, 2018, 12:08 a.m. UTC 
Fixes: nature_360-7501616eb5eafca5-1111.mp4

Reported-by: Thierry Foucu <tfoucu@google.com>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
---
 libavcodec/h264_refs.c | 1 +
 1 file changed, 1 insertion(+)

Comments

Michael Niedermayer Sept. 2, 2018, 9:40 p.m. UTC | #1 
On Fri, Aug 17, 2018 at 02:08:40AM +0200, Michael Niedermayer wrote:
> Fixes: nature_360-7501616eb5eafca5-1111.mp4
> 
> Reported-by: Thierry Foucu <tfoucu@google.com>
> Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
> ---
>  libavcodec/h264_refs.c | 1 +
>  1 file changed, 1 insertion(+)

will apply

[...]
diff mbox

Patch

diff --git a/libavcodec/h264_refs.c b/libavcodec/h264_refs.c
index 976044ce2c..26711c0d85 100644
--- a/libavcodec/h264_refs.c
+++ b/libavcodec/h264_refs.c
@@ -815,6 +815,7 @@  int ff_h264_execute_ref_pic_marking(H264Context *h)
     if (   err >= 0
         && h->long_ref_count==0
         && (   h->short_ref_count<=2
+            || pps_ref_count[0] <= 2 && pps_ref_count[1] <= 1 && h->avctx->has_b_frames
             || 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){