Merge commit 'a78f5548d94f23ce23cece41edf0fe9d18926de6'

* commit 'a78f5548d94f23ce23cece41edf0fe9d18926de6':
  avcodec: Free the default avoptions on init failure

See: 1907ff0a67edeb98d9153aac79f35961837ba3f6
Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavcodec/utils.c
index edb0dd80df8829552c00d479743eb3becfd86db8,c9ae19b8d83113babcd802b8650163678bcf8c16..40dde887e84125c1b1b0311894c60c0a324ab400
--- 1/libavcodec/utils.c
--- 2/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@@ -1709,9 -1292,11 +1709,11 @@@ free_and_end
          (avctx->codec->caps_internal & FF_CODEC_CAP_INIT_CLEANUP))
          avctx->codec->close(avctx);
  
-     av_dict_free(&tmp);
 -    if (avctx->priv_data && avctx->codec && avctx->codec->priv_class)
 +    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);