diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-17 13:47:49 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-17 13:47:49 +0200 |
| commit | 1dd38e99fd1263f112825045eb69a6b041d5bc97 (patch) | |
| tree | 84650b1ea0fc972f4df6c6c71ed1117b4fed903b | |
| parent | 9d1155dae303c20f51ae8579df1b8c3928c3bf21 (diff) | |
| parent | c802a2e718fb3619291f310f851f1a1cdcf4f581 (diff) | |
| download | ffmpeg-1dd38e99fd1263f112825045eb69a6b041d5bc97.tar.gz | |
Merge commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581'
* commit 'c802a2e718fb3619291f310f851f1a1cdcf4f581':
avconv: fix leak in filter error
Conflicts:
ffmpeg_filter.c
See: 14369f59c5ad1fb817fb4d94073f31cccf12b556
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rw-r--r-- | ffmpeg_filter.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c index d52b1f7d76..2ba2d9be21 100644 --- a/ffmpeg_filter.c +++ b/ffmpeg_filter.c @@ -383,9 +383,8 @@ static int configure_output_video_filter(FilterGraph *fg, OutputFilter *ofilter, snprintf(name, sizeof(name), "pixel format for output stream %d:%d", ost->file_index, ost->index); ret = avfilter_graph_create_filter(&filter, - avfilter_get_by_name("format"), - "format", pix_fmts, NULL, - fg->graph); + avfilter_get_by_name("format"), + "format", pix_fmts, NULL, fg->graph); av_freep(&pix_fmts); if (ret < 0) return ret; |