ffmpeg | branch: master | Limin Wang <lance.lmw...@gmail.com> | Mon Jun 1 22:29:13 2020 +0800| [17e88bf0df21906633a7d36d9f2aeeeb5b6d3267] | committer: Limin Wang
avcodec/aacenc: add FF_CODEC_CAP_INIT_CLEANUP Signed-off-by: Limin Wang <lance.lmw...@gmail.com> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=17e88bf0df21906633a7d36d9f2aeeeb5b6d3267 --- libavcodec/aacenc.c | 3 +-- libavcodec/iirfilter.c | 1 - 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/libavcodec/aacenc.c b/libavcodec/aacenc.c index db11e0ca29..189f5e051f 100644 --- a/libavcodec/aacenc.c +++ b/libavcodec/aacenc.c @@ -1115,7 +1115,6 @@ static av_cold int aac_encode_init(AVCodecContext *avctx) return 0; fail: - aac_encode_end(avctx); return ret; } @@ -1159,7 +1158,7 @@ AVCodec ff_aac_encoder = { .close = aac_encode_end, .defaults = aac_encode_defaults, .supported_samplerates = mpeg4audio_sample_rates, - .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE, + .caps_internal = FF_CODEC_CAP_INIT_THREADSAFE | FF_CODEC_CAP_INIT_CLEANUP, .capabilities = AV_CODEC_CAP_SMALL_LAST_FRAME | AV_CODEC_CAP_DELAY, .sample_fmts = (const enum AVSampleFormat[]){ AV_SAMPLE_FMT_FLTP, AV_SAMPLE_FMT_NONE }, diff --git a/libavcodec/iirfilter.c b/libavcodec/iirfilter.c index b202515827..749fa5757f 100644 --- a/libavcodec/iirfilter.c +++ b/libavcodec/iirfilter.c @@ -197,7 +197,6 @@ av_cold struct FFIIRFilterCoeffs *ff_iir_filter_init_coeffs(void *avc, return c; init_fail: - ff_iir_filter_free_coeffsp(&c); return NULL; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog To unsubscribe, visit link above, or email ffmpeg-cvslog-requ...@ffmpeg.org with subject "unsubscribe".
