ffmpeg | branch: master | Anton Khirnov <an...@khirnov.net> | Sat Jun 1 13:49:32 2024 +0200| [90fc331b0fc6f7d9c31f9e6d543102ba7fe02daf] | committer: Anton Khirnov
lavc/hevcdec: only ignore INVALIDDATA in decode_nal_unit() All other errors should cause a failure, regardless of the value of err_recognition. Also, print a warning message when skipping invalid NAL units. > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=90fc331b0fc6f7d9c31f9e6d543102ba7fe02daf --- 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) _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
