All other errors should cause a failure, regardless of the value of
err_recognition. Also, print a warning message when skipping invalid NAL
units.
---
libavcodec/hevc/hevcdec.c | 10 +++++++---
1 file changed, 7 insertions(+), 3 deletions(-)
diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c
index d599373c9d..2c26d397df 100644
--- a/libavcodec/hevc/hevcdec.c
+++ b/libavcodec/hevc/hevcdec.c
@@ -3206,9 +3206,13 @@ static int decode_nal_unit(HEVCContext *s, const
H2645NAL *nal)
return 0;
fail:
- if (s->avctx->err_recognition & AV_EF_EXPLODE)
- return ret;
- return 0;
+ if (ret == AVERROR_INVALIDDATA &&
+ !(s->avctx->err_recognition & AV_EF_EXPLODE)) {
+ av_log(s->avctx, AV_LOG_WARNING,
+ "Skipping invalid undecodable NALU: %d\n", s->nal_unit_type);
+ return 0;
+ }
+ return ret;
}
static int decode_nal_units(HEVCContext *s, const uint8_t *buf, int length)
--
2.43.0
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email
ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".
