From a78f5548d94f23ce23cece41edf0fe9d18926de6 Mon Sep 17 00:00:00 2001
From: Luca Barbato <lu_zero@gentoo.org>
Date: Tue, 21 Apr 2015 18:17:38 +0200
Subject: avcodec: Free the default avoptions on init failure

---
 libavcodec/utils.c | 4 ++++
 1 file changed, 4 insertions(+)

(limited to 'libavcodec/utils.c')

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 7740147bb6..c9ae19b8d8 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1292,6 +1292,10 @@ free_and_end:
         (avctx->codec->caps_internal & FF_CODEC_CAP_INIT_CLEANUP))
         avctx->codec->close(avctx);
 
+    if (avctx->priv_data && avctx->codec && avctx->codec->priv_class)
+        av_opt_free(avctx->priv_data);
+    av_opt_free(avctx);
+
     av_dict_free(&tmp);
     av_freep(&avctx->priv_data);
     if (avctx->internal) {
-- 
cgit v1.2.3