mirror of
https://git.ffmpeg.org/ffmpeg.git
synced 2024-12-24 16:22:37 +00:00
Merge commit 'a78f5548d94f23ce23cece41edf0fe9d18926de6'
* commit 'a78f5548d94f23ce23cece41edf0fe9d18926de6':
avcodec: Free the default avoptions on init failure
See: 1907ff0a67
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
b112e25dde
@ -1709,9 +1709,11 @@ free_and_end:
|
||||
(avctx->codec->caps_internal & FF_CODEC_CAP_INIT_CLEANUP))
|
||||
avctx->codec->close(avctx);
|
||||
|
||||
av_dict_free(&tmp);
|
||||
if (codec->priv_class && codec->priv_data_size)
|
||||
av_opt_free(avctx->priv_data);
|
||||
av_opt_free(avctx);
|
||||
|
||||
av_dict_free(&tmp);
|
||||
av_freep(&avctx->priv_data);
|
||||
if (avctx->internal) {
|
||||
av_frame_free(&avctx->internal->to_free);
|
||||
|
Loading…
Reference in New Issue
Block a user