[FFmpeg-cvslog] avconv: fix leak in filter error

Vittorio Giovara git at videolan.org
Fri Oct 17 14:04:40 CEST 2014


ffmpeg | branch: master | Vittorio Giovara <vittorio.giovara at gmail.com> | Tue Oct 14 16:46:44 2014 +0100| [c802a2e718fb3619291f310f851f1a1cdcf4f581] | committer: Vittorio Giovara

avconv: fix leak in filter error

CC: libav-stable at libav.org
Bug-Id: CID 1005311

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

 avconv_filter.c |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/avconv_filter.c b/avconv_filter.c
index 1eda7b8..e54da56 100644
--- a/avconv_filter.c
+++ b/avconv_filter.c
@@ -268,17 +268,17 @@ static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter,
         AVFilterContext *filter;
         snprintf(name, sizeof(name), "pixel format for output stream %d:%d",
                  ost->file_index, ost->index);
-        if ((ret = avfilter_graph_create_filter(&filter,
-                                                avfilter_get_by_name("format"),
-                                                "format", pix_fmts, NULL,
-                                                fg->graph)) < 0)
+        ret = avfilter_graph_create_filter(&filter,
+                                           avfilter_get_by_name("format"),
+                                           "format", pix_fmts, NULL, fg->graph);
+        av_freep(&pix_fmts);
+        if (ret < 0)
             return ret;
         if ((ret = avfilter_link(last_filter, pad_idx, filter, 0)) < 0)
             return ret;
 
         last_filter = filter;
         pad_idx     = 0;
-        av_freep(&pix_fmts);
     }
 
     if (ost->frame_rate.num) {



More information about the ffmpeg-cvslog mailing list