Merge commit 'c77d409bf95954aceb762dd800d1ee2868c4b0d4'

[ffmpeg] / libavcodec / h264.c

diff --git a/libavcodec/h264.c b/libavcodec/h264.c
index a9995bd8bcde8f76ad662eb8ce5ff227a696d90f..09898a6bb774eff16fbc7a4e2c0d3b635230fc3e 100644 (file)
--- a/libavcodec/h264.c
+++ b/libavcodec/h264.c
@@ -4757,8 +4757,7 @@ static int decode_nal_units(H264Context *h, const uint8_t *buf, int buf_size,
                     first_slice = hx->nal_unit_type;
                 }
 
-            // FIXME do not discard SEI id
-            if (avctx->skip_frame >= AVDISCARD_NONREF && h->nal_ref_idc == 0)
+            if (avctx->skip_frame >= AVDISCARD_NONREF && h->nal_ref_idc == 0 && h->nal_unit_type != NAL_SEI)
                 continue;
 
 again: