Extradata may be allocated and the AudioConverterRef may be created during
init(),
which in case of a failure would not be freed as close() isn't called
afterwards.
Signed-off-by: James Almer <jamr...@gmail.com>
---
Untested.
The documentation for AudioConverterDispose() didn't say if it could handle
NULL as
argument, so i added a check just in case.
If anyone can confirm NULL is a valid argument i'll remove that chunk.
libavcodec/audiotoolboxdec.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/libavcodec/audiotoolboxdec.c b/libavcodec/audiotoolboxdec.c
index d499a0afc8..c30817778f 100644
--- a/libavcodec/audiotoolboxdec.c
+++ b/libavcodec/audiotoolboxdec.c
@@ -599,7 +599,8 @@ static av_cold void ffat_decode_flush(AVCodecContext *avctx)
static av_cold int ffat_close_decoder(AVCodecContext *avctx)
{
ATDecodeContext *at = avctx->priv_data;
- AudioConverterDispose(at->converter);
+ if (at->converter)
+ AudioConverterDispose(at->converter);
av_bsf_free(&at->bsf);
av_packet_unref(&at->new_in_pkt);
av_packet_unref(&at->in_pkt);
@@ -628,7 +629,7 @@ static av_cold int ffat_close_decoder(AVCodecContext *avctx)
.flush = ffat_decode_flush, \
.priv_class = &ffat_##NAME##_dec_class, \
.capabilities = AV_CODEC_CAP_DR1 | AV_CODEC_CAP_DELAY, \
- .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, \
+ .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE |
FF_CODEC_CAP_INIT_CLEANUP, \
};
FFAT_DEC(aac, AV_CODEC_ID_AAC)
--
2.12.1
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
