[FFmpeg-devel] [PATCH 38/39] lavc/hevcdec: do not unref current frame on frame_end() failure

Anton Khirnov anton at khirnov.net
Fri Jun 7 16:01:34 EEST 2024


It's a race with frame threading.
---
 libavcodec/hevc/hevcdec.c | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/libavcodec/hevc/hevcdec.c b/libavcodec/hevc/hevcdec.c
index a8c2172674..5fc55d5de9 100644
--- a/libavcodec/hevc/hevcdec.c
+++ b/libavcodec/hevc/hevcdec.c
@@ -3135,17 +3135,14 @@ static int hevc_frame_end(HEVCContext *s)
         if (ret < 0) {
             av_log(s->avctx, AV_LOG_ERROR,
                    "hardware accelerator failed to decode picture\n");
-            ff_hevc_unref_frame(s->cur_frame, ~0);
             return ret;
         }
     } else {
         if (s->avctx->err_recognition & AV_EF_CRCCHECK &&
             s->sei.picture_hash.is_md5) {
             ret = verify_md5(s, s->cur_frame->f);
-            if (ret < 0 && s->avctx->err_recognition & AV_EF_EXPLODE) {
-                ff_hevc_unref_frame(s->cur_frame, ~0);
+            if (ret < 0 && s->avctx->err_recognition & AV_EF_EXPLODE)
                 return ret;
-            }
         }
     }
     s->sei.picture_hash.is_md5 = 0;
-- 
2.43.0



More information about the ffmpeg-devel mailing list