Skip to content
Snippets Groups Projects
Commit 14573b9b authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files

Revert "Merge commit '8b830ee9'" (avconv: Do...

Revert "Merge commit '8b830ee9'" (avconv: Do not try to configure filter outputs without streams)

FFmpeg already tests for this case in configure_output_filter() and printed a
clearer error message

example:
./ffmpeg -f lavfi -i color -f lavfi -i color -filter_complex "[1]null[x],[0][1]overlay" -f null -
before the merge / after the revert:
Filter null has a unconnected output

after the merge / before the revert:
Output pad "default" with type video of the filter instance "Parsed_null_0" of null not connected to any destination
Error configuring complex filters.
Invalid argument

This reverts commit 3e3779cd, reversing
changes made to 0b28039a.

Reviewed-by: default avatarGanesh Ajjanagadde <gajjanag@mit.edu>
parent 2a4d1a66
No related branches found
No related tags found
No related merge requests found
...@@ -1035,12 +1035,8 @@ int configure_filtergraph(FilterGraph *fg) ...@@ -1035,12 +1035,8 @@ int configure_filtergraph(FilterGraph *fg)
} }
avfilter_inout_free(&inputs); avfilter_inout_free(&inputs);
for (cur = outputs, i = 0; cur; cur = cur->next, i++) { for (cur = outputs, i = 0; cur; cur = cur->next, i++)
OutputFilter *ofilter = fg->outputs[i]; configure_output_filter(fg, fg->outputs[i], cur);
if (ofilter->ost)
configure_output_filter(fg, ofilter, cur);
}
avfilter_inout_free(&outputs); avfilter_inout_free(&outputs);
if ((ret = avfilter_graph_config(fg->graph, NULL)) < 0) if ((ret = avfilter_graph_config(fg->graph, NULL)) < 0)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment