1. ffmpeg
  2. Commit 1dd38e99fd1263f112825045eb69a6b041d5bc97
Browse code

Merge commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581'

* commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581':
avconv: fix leak in filter error

Conflicts:
ffmpeg_filter.c

See: 14369f59c5ad1fb817fb4d94073f31cccf12b556
Merged-by: Michael Niedermayer <michaelni@gmx.at>

Michael Niedermayer authored on 2014/10/17 20:47:49
Showing 1 changed files
ffmpeg_filter.c
History View file @ 1dd38e9
... ... 
@@ -383,9 +383,8 @@ static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter,
383 383 
         snprintf(name, sizeof(name), "pixel format for output stream %d:%d",
384 384 
                  ost->file_index, ost->index);
385 385 
         ret = avfilter_graph_create_filter(&filter,
386 
-                                                avfilter_get_by_name("format"),
387 
-                                                "format", pix_fmts, NULL,
388 
-                                                fg->graph);
386 
+                                           avfilter_get_by_name("format"),
387 
+                                           "format", pix_fmts, NULL, fg->graph);
389 388 
         av_freep(&pix_fmts);
390 389 
         if (ret < 0)
391 390 
             return ret;