[FFmpeg-devel] [PATCH] avcodec/avcodec: don't free AVOption settable fields in avcodec_close()
James Almer
jamrial at gmail.com
Mon Mar 21 01:18:09 EET 2022
It can uninitialize fields that may still be used after the context was closed,
so do it instead in avcodec_free_context().
Signed-off-by: James Almer <jamrial at gmail.com>
---
libavcodec/avcodec.c | 1 -
libavcodec/options.c | 2 +-
2 files changed, 1 insertion(+), 2 deletions(-)
diff --git a/libavcodec/avcodec.c b/libavcodec/avcodec.c
index 38bdaad4fa..122d09b63a 100644
--- a/libavcodec/avcodec.c
+++ b/libavcodec/avcodec.c
@@ -524,7 +524,6 @@ av_cold int avcodec_close(AVCodecContext *avctx)
if (avctx->priv_data && avctx->codec && avctx->codec->priv_class)
av_opt_free(avctx->priv_data);
- av_opt_free(avctx);
av_freep(&avctx->priv_data);
if (av_codec_is_encoder(avctx->codec)) {
av_freep(&avctx->extradata);
diff --git a/libavcodec/options.c b/libavcodec/options.c
index 33f11480a7..91335415c1 100644
--- a/libavcodec/options.c
+++ b/libavcodec/options.c
@@ -172,7 +172,7 @@ void avcodec_free_context(AVCodecContext **pavctx)
av_freep(&avctx->intra_matrix);
av_freep(&avctx->inter_matrix);
av_freep(&avctx->rc_override);
- av_channel_layout_uninit(&avctx->ch_layout);
+ av_opt_free(avctx);
av_freep(pavctx);
}
--
2.35.1
More information about the ffmpeg-devel
mailing list