[FFmpeg-cvslog] avcodec/zerocodec: use init cleanup internal cap

Paul B Mahol git at videolan.org
Fri Apr 10 13:30:21 EEST 2020


ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Thu Apr  9 10:48:35 2020 +0200| [932493f9c2a8cd9c79878694a26a0521114b59a4] | committer: Paul B Mahol

avcodec/zerocodec: use init cleanup internal cap

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=932493f9c2a8cd9c79878694a26a0521114b59a4
---

 libavcodec/zerocodec.c | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/libavcodec/zerocodec.c b/libavcodec/zerocodec.c
index b0fab91004..1051fdaa45 100644
--- a/libavcodec/zerocodec.c
+++ b/libavcodec/zerocodec.c
@@ -131,10 +131,8 @@ static av_cold int zerocodec_decode_init(AVCodecContext *avctx)
     }
 
     zc->previous_frame = av_frame_alloc();
-    if (!zc->previous_frame) {
-        zerocodec_decode_close(avctx);
+    if (!zc->previous_frame)
         return AVERROR(ENOMEM);
-    }
 
     return 0;
 }
@@ -157,5 +155,6 @@ AVCodec ff_zerocodec_decoder = {
     .flush          = zerocodec_decode_flush,
     .close          = zerocodec_decode_close,
     .capabilities   = AV_CODEC_CAP_DR1,
-    .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE,
+    .caps_internal  = FF_CODEC_CAP_INIT_THREADSAFE |
+                      FF_CODEC_CAP_INIT_CLEANUP,
 };



More information about the ffmpeg-cvslog mailing list