Browse Source

Merge commit '8b830ee9a26d47b138f12a82085cdb372f407f1e'

* commit '8b830ee9a26d47b138f12a82085cdb372f407f1e':
  avconv: Do not try to configure filter outputs without streams

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
tags/n3.0
Hendrik Leppkes 10 years ago
parent
commit
3e3779cd51
1 changed files with 6 additions and 2 deletions
  1. +6
    -2
      ffmpeg_filter.c

+ 6
- 2
ffmpeg_filter.c View File

@@ -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)


Loading…
Cancel
Save