diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2015-04-23 21:31:06 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2015-04-23 21:41:23 +0200 |
| commit | b112e25dde39a86befaed7e294facd8d860322da (patch) | |
| tree | 738f301894647b5f6af9b9ab434ee0b12d280db4 /libavcodec | |
| parent | c39b07ff282a4a7a0c5af1ee0c2958b5126387df (diff) | |
| parent | a78f5548d94f23ce23cece41edf0fe9d18926de6 (diff) | |
| download | ffmpeg-b112e25dde39a86befaed7e294facd8d860322da.tar.gz | |
Merge commit 'a78f5548d94f23ce23cece41edf0fe9d18926de6'
* commit 'a78f5548d94f23ce23cece41edf0fe9d18926de6':
avcodec: Free the default avoptions on init failure
See: 1907ff0a67edeb98d9153aac79f35961837ba3f6
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/utils.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index edb0dd80df..40dde887e8 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -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); |