[FFmpeg-cvslog] lavc/utils: free private options on avcodec_open2 fail

[Lukasz Marek]

ffmpeg | branch: master | Lukasz Marek <lukasz.m.luki2 at gmail.com> | Sun Nov 23 00:55:33 2014 +0100| [1907ff0a67edeb98d9153aac79f35961837ba3f6] | committer: Lukasz Marek

lavc/utils: free private options on avcodec_open2 fail

It protects leaking string/binary/dict options from priv context.

Signed-off-by: Lukasz Marek <lukasz.m.luki2 at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=1907ff0a67edeb98d9153aac79f35961837ba3f6
---

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

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index c06a733..66fe62c 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -1690,6 +1690,8 @@ end:
     return ret;
 free_and_end:
     av_dict_free(&tmp);
+    if (codec->priv_class && codec->priv_data_size)
+        av_opt_free(avctx->priv_data);
     av_freep(&avctx->priv_data);
     if (avctx->internal) {
         av_frame_free(&avctx->internal->to_free);