diff options
| author | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-10 09:43:47 +0200 |
|---|---|---|
| committer | Hendrik Leppkes <h.leppkes@gmail.com> | 2015-10-10 09:43:47 +0200 |
| commit | 3e3779cd517e4d2d1f21d5eb6afdb428cd3c1aa0 (patch) | |
| tree | c4ed551ab301256f41c3a5f94cf13e0d0afdcda3 /ffmpeg_filter.c | |
| parent | 0b28039a44b33753d77116691d680bd60f3bac1f (diff) | |
| parent | 8b830ee9a26d47b138f12a82085cdb372f407f1e (diff) | |
| download | ffmpeg-3e3779cd517e4d2d1f21d5eb6afdb428cd3c1aa0.tar.gz | |
Merge commit '8b830ee9a26d47b138f12a82085cdb372f407f1e'
* commit '8b830ee9a26d47b138f12a82085cdb372f407f1e':
avconv: Do not try to configure filter outputs without streams
Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
Diffstat (limited to 'ffmpeg_filter.c')
| -rw-r--r-- | ffmpeg_filter.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/ffmpeg_filter.c b/ffmpeg_filter.c index 10b2f5f722..9426a8849f 100644 --- a/ffmpeg_filter.c +++ b/ffmpeg_filter.c @@ -1035,8 +1035,12 @@ int configure_filtergraph(FilterGraph *fg) } avfilter_inout_free(&inputs); - for (cur = outputs, i = 0; cur; cur = cur->next, i++) - configure_output_filter(fg, fg->outputs[i], cur); + for (cur = outputs, i = 0; cur; cur = cur->next, i++) { + OutputFilter *ofilter = fg->outputs[i]; + if (ofilter->ost) + configure_output_filter(fg, ofilter, cur); + } + avfilter_inout_free(&outputs); if ((ret = avfilter_graph_config(fg->graph, NULL)) < 0) |