From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTP id 263B3410B3 for ; Tue, 15 Mar 2022 20:08:40 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 2BC0068B174; Tue, 15 Mar 2022 22:06:48 +0200 (EET) Received: from EUR05-VI1-obe.outbound.protection.outlook.com (mail-vi1eur05olkn2053.outbound.protection.outlook.com [40.92.90.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 4150368B13B for ; Tue, 15 Mar 2022 22:06:43 +0200 (EET) ARC-Seal: i=1; a=rsa-sha256; s=arcselector9901; d=microsoft.com; cv=none; b=fwuXcpAc1yA4d3T+4GeJqkjjelBM2vGL81sQzO9wVzSc5OPQzS5wlbcHTsII4hSN2k81Z+rmhbkPt1yBbTv/eDSBP8R+S6+V+7wavgjktgxSW6Sfn1XNQdi99MTdMqxrzFVenD8yfrracWcB3YMddSkO+9uo+4GzJBlAPMd3qdw8+qZUizof+M6udWRF0WgY7lypSpb5saZxT85SCkid4n9x2ljQNakD9oeq1wMOVHvzb1Jg4rNK0PVMotV1d07EEE/tK8ZTSEk+PbDyXg0tEOHY8+pDK/561G9aoeoTa0uqa1+pr17Jrd27raIKkuSVsasEf+VCKH+E5O3DB1Ubpw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=microsoft.com; s=arcselector9901; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-AntiSpam-MessageData-ChunkCount:X-MS-Exchange-AntiSpam-MessageData-0:X-MS-Exchange-AntiSpam-MessageData-1; bh=77lhE7IIALcJRu9jQBdio8cNdY2V6yVC8h16mt7eA2k=; b=BnQwk2Ty7Ec23CUojdUX7HZyTlAWV6ABGtZ3aSPR7LN+IgvfGtXJlgp+SqQfXnOOv5IZPcGfZlhZZ61MW+naVAKbdADFSwFUMDljlgpaUxNH40nHRGRvFCRhpHxEwlaXhl+agITQDgi3azCCvAEDMcphfyosOk2HP5LYGwEq9Gl0KK5nBfV899GgUWYbTzW7UVe+fwvtgdzVSEFvQG2M31JWFem1Ym1eFhyN5ohLAmV+Io/Js3qocu1uFjw9CO/kb7w5OYvtQGrPAjRwrQ0F6rjiJe8klGWTaTdUr5HwVBRRyYQzJBOdfFZWGt/T/jMB6O+2UCL0+engmGbWK9CBxQ== ARC-Authentication-Results: i=1; mx.microsoft.com 1; spf=none; dmarc=none; dkim=none; arc=none DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=outlook.com; s=selector1; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version:X-MS-Exchange-SenderADCheck; bh=77lhE7IIALcJRu9jQBdio8cNdY2V6yVC8h16mt7eA2k=; b=ZAuasuPI3ckQ6LiFblH3QZc++uTMAI6bCl1K+q2hbtfHhJkX+f3kJOm5LxGfxYa2EAjP2I+npycaymzWp8MdVWh1SCkr3F4hNlRMdlp2pyzbi/IB2pFM43w8vF7m466Bm1bjuRCJ4+PdTtUCzsPVCvUrFzWypnJk7uWP5ly3tMrCIPTW9Gx6bFd/fOBpqpwjDTeq6w5G/540J/G6nFaURFyArh5T3mSwPIRpvd00KpdlCO0R0Z0CsUmOWTf1mz+M2J6qOCSAYTnz3pvWMwdzuGmPHKrH5aHvds7ay1qdAa3gQcddjUyPaBUOayr7Kx+7Nw5/BGVvEgeWn+n00G4TKw== Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) by PA4PR01MB8947.eurprd01.prod.exchangelabs.com (2603:10a6:102:2a6::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.5061.26; Tue, 15 Mar 2022 20:06:43 +0000 Received: from AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8]) by AS1PR01MB9564.eurprd01.prod.exchangelabs.com ([fe80::9070:a5fd:e532:bdf8%4]) with mapi id 15.20.5061.028; Tue, 15 Mar 2022 20:06:43 +0000 From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 15 Mar 2022 21:06:05 +0100 Message-ID: X-Mailer: git-send-email 2.32.0 In-Reply-To: References: X-TMN: [yl6DCmhLZcDgL+YYfBY0sNtTVFRqorTn] X-ClientProxiedBy: AM5PR0202CA0004.eurprd02.prod.outlook.com (2603:10a6:203:69::14) To AS1PR01MB9564.eurprd01.prod.exchangelabs.com (2603:10a6:20b:4d1::16) X-Microsoft-Original-Message-ID: <20220315200611.553534-14-andreas.rheinhardt@outlook.com> MIME-Version: 1.0 X-MS-Exchange-MessageSentRepresentingType: 1 X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 71ef02ce-998f-4f67-1f11-08da06bf5308 X-MS-Exchange-SLBlob-MailProps: S/btQ8cKWiQIK6GOv6I/5+ncmNhpuEjVBeJ67f/nzBE9o09n3f8ffCp3YZin6OssaCbTs3i27mRpPD62RzEgjyQ+k4iJR2opJRUTlxxkCTVNiSYu1PLDPRcnEWLiDvfsPtsCcvl+UHCkCdlTl1bwYnT38QdHBznZpLKdilY19uurfBSE9nizz4jHLnKImv177xtDepokZayqEv7WjRSuKDsAKyOGWf6B/VXjQC+EUMrFCGspyW8VVAJIs6v56x3N2U8nx4U0ECL8wmy70p/CX0CulcRGO1Q/5Mk6Lb2DVtX6FRrDAcw61UpChv6KzGl7cCtgU1/iVRoFSeR+g5NbmqZ3+OtG61ABlhf8JDv4t/mjku0sLvn8VAngm+3OA9F+wnDkIjNz7z0YwaE2Icv31rKfMdACOvyu8mfhrKMWGecyqdJFIGjHjLqPLoIfurIo46DYE15iV+dKj85Lk0dHLlyRPiKRS4g8dwEiG135IOGI4Hn5FxyGwlZxmQTXy/EO1rHV+0j4OmbTyLidnd/W3xqW7O0BtVuT4oSsAVy6uzFlqU0yarS+E6e1jnLcQ17K3HcjAjcBFqsTqvwRV9G/6/RL+3rvIjlTOFebs8E8FVhS41Qs6qKR1jHhcla5K8FPeQ/hjwjVK7IFrdWRcC7jlzIouhzLP5mdbCwB0FF7mZ5+MduSUfmRSqphY3M5W5rPfGU8zymL7H4bRv/vEwsg+PuvHqDLRE0bU8661biKCc08tpY31zVDajmqKfbqN4V8WcCHx2HXP6o= X-MS-TrafficTypeDiagnostic: PA4PR01MB8947:EE_ X-Microsoft-Antispam: BCL:0; X-Microsoft-Antispam-Message-Info: nG+izekyHQ4YsIlZ0DHiPrSyK4skQKagQ+QSMGlv6O17OY6xL0lVJjxtWGkaSmah8JBDo4AUsLcVfXbRh0nKrOgB4lIn7/RoAwuFocGKLoBTPBo2uLt04tEukXlrsz5Rx7hZzDlCXHLfD7l24dW4gfn77XnS9W1fvcqfd9VNEcRGITtdb8KoAZnOyxMLeA52d1IbQqVIh2e8AxFrqLHk30OLr6nPvqhNOo9wq7mG6HUTurzy6qUee1q1JW7mDXnUOX9PJKCOeVuyiol0EjyDFsuJCpb1v+5Qr9lnnpB00iNkyFkKZucrn1v/v3ny4JPDJhSew4jHzf04grPFZWg37nPAiu1lbFOqnSjB7pfRvtogba1CM2dda9/6iribhq2AT3tA+00l+E4TDAzFbYd17h8xq18udPmRiWlNW7PWH2Af+VdPVe+90f8F/dgFvraB2i5dX6qzJrkeK54vi3oIiTD+qZow0Xs8oY6KsdbFsuuhR8Zzfgbs2n8OubpSL7jaE+MrdwNLeT8EaVT1vIOaabq7KEpqEnpxaueOMJ0CwGd9SEEgHTS83teYbEgNu+MWoA1lyTz7Lg09CVxElGediQ== X-MS-Exchange-AntiSpam-MessageData-ChunkCount: 1 X-MS-Exchange-AntiSpam-MessageData-0: =?us-ascii?Q?AZs1NeZ/dNcNr8BfdyAKMbs3207djS6VHHGnKEwN7Ru8u3PqFMgJ36csqWi9?= =?us-ascii?Q?eOKw4VbkYaaV9/QvGzoYxB2bdEwPK3vPIcOgnWq5PltxO2IYcw1+a+jL3AWK?= =?us-ascii?Q?4zWpx+ViBI9rSsmIDhgxLACJvXIKmvU6yUsScVn2AaI9IoKU/AvFs/vGtDi3?= =?us-ascii?Q?vupxPf9TIIyVff2LYyhLiZRa6lvHnOA3+66Jig5THsDGhRLlVMxkj+wCZyrI?= =?us-ascii?Q?ubLYJMZERBBtgpq1rxyRN6iQHX3UckxpBWAx5SprTcM+rs+bQPbWN4/WV+hp?= =?us-ascii?Q?C76zmPLj1m4HsEhBJTEsjDRvlUrchiuOuPWXV1MeB0qHfi12ijAQUcxFI+Px?= =?us-ascii?Q?DAFx0j9bfmDbPY/4wenRaqU3krR8Nm4DvFV5OUJ0m+uZNqRpd3qm4ktPiJDM?= =?us-ascii?Q?7z/YHd6LMnU8/8Dc3ni0KFm1QvexeJmB0GW2qL2GKXTHKwF5vgbr3BcNuxu7?= =?us-ascii?Q?W0G7O3+U3zbdTw2VZ+GDRirqKRxdnOg6OnMxcFPanZYoxMOJS8gwzmKkfEaj?= =?us-ascii?Q?SqoblvCQ9ujS4wqJJbRPZIPP7FYZdoEDylwMjzLPvgtdV/O9AQEtxuXBagEx?= =?us-ascii?Q?0f3xiAj/jQMphcoBSQVSq/sORraf6fi91qpfNugMgvRlrb30umdiRSyEHkTI?= =?us-ascii?Q?ZooOrlDmdJwxnmngIETTEEX2VXhmEOg9T022xB05Yeo8Qj9rIUycVFXCm/un?= =?us-ascii?Q?6n6BUCzOViQ+4uyR8QP85FgPZRm20ORTZ0Zwf/o+kV3oVMXZlSrLmQkcpEZ4?= =?us-ascii?Q?2h5uhvDIONtuwEVq6dafcrf8cXjHzqOZfd71kRxfRuybLBrIlvVuB56fYrSo?= =?us-ascii?Q?u3pkaourpmcfxqbtP1Yf8yXMGUCVxcDD84nG4UNljkiSO12P0IwIUg7e1qdy?= =?us-ascii?Q?ZKO31EVEvcHVuCbFMFdphCaFM/gRCaymlHwCqV34/ECBlis5Evtm1uVaK4fm?= =?us-ascii?Q?p/Czwb9rZq9ADkOSUAGxMCzZNThFYqJ6PZrQ66HJoaddw3U6c4Dx5NUYf5RQ?= =?us-ascii?Q?pQYkuyYwrNDxbzOcI+vBZk+eJZDCmHxU2Imq9n5JiP0v0WOJcYQFMDe0rX62?= =?us-ascii?Q?myo3/bSiOJK0NsiIVPXltMU24tS6IOuNYnsvdN12owkR1aa6nz4Q6dh0COyE?= =?us-ascii?Q?eYVt3CYLkDtM1MPc+eyMwFQ7EHAF0TLtCN93RHOwtRqtZIp8E94ZRsw=3D?= X-OriginatorOrg: outlook.com X-MS-Exchange-CrossTenant-Network-Message-Id: 71ef02ce-998f-4f67-1f11-08da06bf5308 X-MS-Exchange-CrossTenant-AuthSource: AS1PR01MB9564.eurprd01.prod.exchangelabs.com X-MS-Exchange-CrossTenant-AuthAs: Internal X-MS-Exchange-CrossTenant-OriginalArrivalTime: 15 Mar 2022 20:06:43.0106 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 84df9e7f-e9f6-40af-b435-aaaaaaaaaaaa X-MS-Exchange-CrossTenant-RMS-PersistedConsumerOrg: 00000000-0000-0000-0000-000000000000 X-MS-Exchange-Transport-CrossTenantHeadersStamped: PA4PR01MB8947 Subject: [FFmpeg-devel] [PATCH 15/21] avcodec/pngdec: Don't open and close z_streams unnecessarily X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: Instead reuse and reset a single z_stream. Also use FFZStream in decode_zbuf(), because it has nicer error messages. Signed-off-by: Andreas Rheinhardt --- configure | 4 +- libavcodec/pngdec.c | 108 +++++++++++++++++++------------------------- 2 files changed, 48 insertions(+), 64 deletions(-) diff --git a/configure b/configure index 0e5923fced..74485fb713 100755 --- a/configure +++ b/configure @@ -2758,7 +2758,7 @@ amrwb_decoder_select="lsp" amv_decoder_select="sp5x_decoder exif" amv_encoder_select="jpegtables mpegvideoenc" ape_decoder_select="bswapdsp llauddsp" -apng_decoder_deps="zlib" +apng_decoder_select="inflate_wrapper" apng_encoder_deps="zlib" apng_encoder_select="llvidencdsp" aptx_decoder_select="audio_frame_queue" @@ -2903,7 +2903,7 @@ on2avc_decoder_select="mdct" opus_decoder_deps="swresample" opus_decoder_select="mdct15" opus_encoder_select="audio_frame_queue mdct15" -png_decoder_deps="zlib" +png_decoder_select="inflate_wrapper" png_encoder_deps="zlib" png_encoder_select="llvidencdsp" prores_decoder_select="blockdsp idctdsp" diff --git a/libavcodec/pngdec.c b/libavcodec/pngdec.c index a335a29b08..67931aad81 100644 --- a/libavcodec/pngdec.c +++ b/libavcodec/pngdec.c @@ -37,6 +37,7 @@ #include "pngdsp.h" #include "thread.h" #include "threadframe.h" +#include "zlib_wrapper.h" #include @@ -105,7 +106,7 @@ typedef struct PNGDecContext { int row_size; /* decompressed row size */ int pass_row_size; /* decompress row size of the current pass */ int y; - z_stream zstream; + FFZStream zstream; } PNGDecContext; /* Mask to determine which pixels are valid in a pass */ @@ -427,27 +428,28 @@ the_end:; static int png_decode_idat(PNGDecContext *s, GetByteContext *gb, uint8_t *dst, ptrdiff_t dst_stride) { + z_stream *const zstream = &s->zstream.zstream; int ret; - s->zstream.avail_in = bytestream2_get_bytes_left(gb); - s->zstream.next_in = gb->buffer; + zstream->avail_in = bytestream2_get_bytes_left(gb); + zstream->next_in = gb->buffer; /* decode one line if possible */ - while (s->zstream.avail_in > 0) { - ret = inflate(&s->zstream, Z_PARTIAL_FLUSH); + while (zstream->avail_in > 0) { + ret = inflate(zstream, Z_PARTIAL_FLUSH); if (ret != Z_OK && ret != Z_STREAM_END) { av_log(s->avctx, AV_LOG_ERROR, "inflate returned error %d\n", ret); return AVERROR_EXTERNAL; } - if (s->zstream.avail_out == 0) { + if (zstream->avail_out == 0) { if (!(s->pic_state & PNG_ALLIMAGE)) { png_handle_row(s, dst, dst_stride); } - s->zstream.avail_out = s->crow_size; - s->zstream.next_out = s->crow_buf; + zstream->avail_out = s->crow_size; + zstream->next_out = s->crow_buf; } - if (ret == Z_STREAM_END && s->zstream.avail_in > 0) { + if (ret == Z_STREAM_END && zstream->avail_in > 0) { av_log(s->avctx, AV_LOG_WARNING, - "%d undecompressed bytes left in buffer\n", s->zstream.avail_in); + "%d undecompressed bytes left in buffer\n", zstream->avail_in); return 0; } } @@ -455,45 +457,43 @@ static int png_decode_idat(PNGDecContext *s, GetByteContext *gb, } static int decode_zbuf(AVBPrint *bp, const uint8_t *data, - const uint8_t *data_end) + const uint8_t *data_end, void *logctx) { - z_stream zstream; + FFZStream z; + z_stream *const zstream = &z.zstream; unsigned char *buf; unsigned buf_size; - int ret; + int ret = ff_inflate_init(&z, logctx); + if (ret < 0) + return ret; - zstream.zalloc = ff_png_zalloc; - zstream.zfree = ff_png_zfree; - zstream.opaque = NULL; - if (inflateInit(&zstream) != Z_OK) - return AVERROR_EXTERNAL; - zstream.next_in = data; - zstream.avail_in = data_end - data; + zstream->next_in = data; + zstream->avail_in = data_end - data; av_bprint_init(bp, 0, AV_BPRINT_SIZE_UNLIMITED); - while (zstream.avail_in > 0) { + while (zstream->avail_in > 0) { av_bprint_get_buffer(bp, 2, &buf, &buf_size); if (buf_size < 2) { ret = AVERROR(ENOMEM); goto fail; } - zstream.next_out = buf; - zstream.avail_out = buf_size - 1; - ret = inflate(&zstream, Z_PARTIAL_FLUSH); + zstream->next_out = buf; + zstream->avail_out = buf_size - 1; + ret = inflate(zstream, Z_PARTIAL_FLUSH); if (ret != Z_OK && ret != Z_STREAM_END) { ret = AVERROR_EXTERNAL; goto fail; } - bp->len += zstream.next_out - buf; + bp->len += zstream->next_out - buf; if (ret == Z_STREAM_END) break; } - inflateEnd(&zstream); + ff_inflate_end(&z); bp->str[bp->len] = 0; return 0; fail: - inflateEnd(&zstream); + ff_inflate_end(&z); av_bprint_finalize(bp, NULL); return ret; } @@ -543,7 +543,7 @@ static int decode_text_chunk(PNGDecContext *s, GetByteContext *gb, int compresse method = *(data++); if (method) return AVERROR_INVALIDDATA; - if ((ret = decode_zbuf(&bp, data, data_end)) < 0) + if ((ret = decode_zbuf(&bp, data, data_end, s->avctx)) < 0) return ret; text_len = bp.len; ret = av_bprint_finalize(&bp, (char **)&text); @@ -765,8 +765,8 @@ static int decode_idat_chunk(AVCodecContext *avctx, PNGDecContext *s, /* we want crow_buf+1 to be 16-byte aligned */ s->crow_buf = s->buffer + 15; - s->zstream.avail_out = s->crow_size; - s->zstream.next_out = s->crow_buf; + s->zstream.zstream.avail_out = s->crow_size; + s->zstream.zstream.next_out = s->crow_buf; } s->pic_state |= PNG_IDAT; @@ -875,7 +875,7 @@ static int decode_iccp_chunk(PNGDecContext *s, GetByteContext *gb, AVFrame *f) goto fail; } - if ((ret = decode_zbuf(&bp, gb->buffer, gb->buffer_end)) < 0) + if ((ret = decode_zbuf(&bp, gb->buffer, gb->buffer_end, s->avctx)) < 0) return ret; av_freep(&s->iccp_data); @@ -1540,15 +1540,10 @@ static int decode_frame_png(AVCodecContext *avctx, s->hdr_state = 0; s->pic_state = 0; - /* init the zlib */ - s->zstream.zalloc = ff_png_zalloc; - s->zstream.zfree = ff_png_zfree; - s->zstream.opaque = NULL; - ret = inflateInit(&s->zstream); - if (ret != Z_OK) { - av_log(avctx, AV_LOG_ERROR, "inflateInit returned error %d\n", ret); + /* Reset z_stream */ + ret = inflateReset(&s->zstream.zstream); + if (ret != Z_OK) return AVERROR_EXTERNAL; - } if ((ret = decode_frame_common(avctx, s, p, avpkt)) < 0) goto the_end; @@ -1572,7 +1567,6 @@ static int decode_frame_png(AVCodecContext *avctx, ret = bytestream2_tell(&s->gb); the_end: - inflateEnd(&s->zstream); s->crow_buf = NULL; return ret; } @@ -1594,37 +1588,30 @@ static int decode_frame_apng(AVCodecContext *avctx, if (!avctx->extradata_size) return AVERROR_INVALIDDATA; - /* only init fields, there is no zlib use in extradata */ - s->zstream.zalloc = ff_png_zalloc; - s->zstream.zfree = ff_png_zfree; - + if ((ret = inflateReset(&s->zstream.zstream)) != Z_OK) + return AVERROR_EXTERNAL; bytestream2_init(&s->gb, avctx->extradata, avctx->extradata_size); if ((ret = decode_frame_common(avctx, s, p, avpkt)) < 0) - goto end; + return ret; } /* reset state for a new frame */ - if ((ret = inflateInit(&s->zstream)) != Z_OK) { - av_log(avctx, AV_LOG_ERROR, "inflateInit returned error %d\n", ret); - ret = AVERROR_EXTERNAL; - goto end; - } + if ((ret = inflateReset(&s->zstream.zstream)) != Z_OK) + return AVERROR_EXTERNAL; s->y = 0; s->pic_state = 0; bytestream2_init(&s->gb, avpkt->data, avpkt->size); if ((ret = decode_frame_common(avctx, s, p, avpkt)) < 0) - goto end; + return ret; if (!(s->pic_state & PNG_ALLIMAGE)) av_log(avctx, AV_LOG_WARNING, "Frame did not contain a complete image\n"); - if (!(s->pic_state & (PNG_ALLIMAGE|PNG_IDAT))) { - ret = AVERROR_INVALIDDATA; - goto end; - } + if (!(s->pic_state & (PNG_ALLIMAGE|PNG_IDAT))) + return AVERROR_INVALIDDATA; ret = output_frame(s, dst_frame, s->picture.f); if (ret < 0) - goto end; + return ret; if (!(avctx->active_thread_type & FF_THREAD_FRAME)) { if (s->dispose_op == APNG_DISPOSE_OP_PREVIOUS) { @@ -1636,11 +1623,7 @@ static int decode_frame_apng(AVCodecContext *avctx, } *got_frame = 1; - ret = bytestream2_tell(&s->gb); - -end: - inflateEnd(&s->zstream); - return ret; + return bytestream2_tell(&s->gb); } #endif @@ -1706,7 +1689,7 @@ static av_cold int png_dec_init(AVCodecContext *avctx) ff_pngdsp_init(&s->dsp); - return 0; + return ff_inflate_init(&s->zstream, avctx); } static av_cold int png_dec_end(AVCodecContext *avctx) @@ -1727,6 +1710,7 @@ static av_cold int png_dec_end(AVCodecContext *avctx) av_freep(&s->iccp_data); av_dict_free(&s->frame_metadata); + ff_inflate_end(&s->zstream); return 0; } -- 2.32.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-request@ffmpeg.org with subject "unsubscribe".