diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-08-30 14:38:40 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-08-30 14:38:44 +0200 |
| commit | ce36d80881132d3ddb7d2d859a604106cf7e92d4 (patch) | |
| tree | 586846f568c11c4a6426f48f1c167191d889626a /ffmpeg_filter.c | |
| parent | a808733675ccfaf19e923477b18c1ad15be4dd67 (diff) | |
| parent | f22c24bd7a57eca27ccc400dbb334b20db5fb050 (diff) | |
| download | ffmpeg-ce36d80881132d3ddb7d2d859a604106cf7e92d4.tar.gz | |
Merge remote-tracking branch 'cehoyos/master'
* cehoyos/master:
lavf/rtpdec_hevc: Fix compilation with -DDEBUG.
ffmpeg: Clean up if filter initialisation failed to avoid a memleak.
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'ffmpeg_filter.c')
| -rw-r--r-- | ffmpeg_filter.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c index b6dc42fe7d..7acff283c8 100644 --- a/ffmpeg_filter.c +++ b/ffmpeg_filter.c @@ -898,8 +898,11 @@ int configure_filtergraph(FilterGraph *fg) init_input_filter(fg, cur); for (cur = inputs, i = 0; cur; cur = cur->next, i++) - if ((ret = configure_input_filter(fg, fg->inputs[i], cur)) < 0) + if ((ret = configure_input_filter(fg, fg->inputs[i], cur)) < 0) { + avfilter_inout_free(&inputs); + avfilter_inout_free(&outputs); return ret; + } avfilter_inout_free(&inputs); if (!init || simple) { |