RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581' 

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

Conflicts:
	ffmpeg_filter.c

See: 14369f59c5
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-10-17 13:47:49 +02:00
parent 9d1155dae3 c802a2e718
commit 1dd38e99fd
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
ffmpeg_filter.c
View File

@ -384,8 +384,7 @@ static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter,
ost->file_index, ost->index); ost->file_index, ost->index);
ret = avfilter_graph_create_filter(&filter, ret = avfilter_graph_create_filter(&filter,
avfilter_get_by_name("format"), avfilter_get_by_name("format"),
"format", pix_fmts, NULL, "format", pix_fmts, NULL, fg->graph);
fg->graph);
av_freep(&pix_fmts); av_freep(&pix_fmts);
if (ret < 0) if (ret < 0)
return ret; return ret;