diff --git a/libavcodec/c93.c b/libavcodec/c93.c
index e1808150b8..7e3bfdbc72 100644
--- a/libavcodec/c93.c
+++ b/libavcodec/c93.c
@@ -63,10 +63,8 @@ static av_cold int decode_init(AVCodecContext *avctx)
 
     s->pictures[0] = av_frame_alloc();
     s->pictures[1] = av_frame_alloc();
-    if (!s->pictures[0] || !s->pictures[1]) {
-        decode_end(avctx);
+    if (!s->pictures[0] || !s->pictures[1])
         return AVERROR(ENOMEM);
-    }
 
     return 0;
 }
@@ -269,5 +267,5 @@ AVCodec ff_c93_decoder = {
     .close          = decode_end,
     .decode         = decode_frame,
     .capabilities   = AV_CODEC_CAP_DR1,
-    .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE,
+    .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP,
 };