videolan/ffmpeg
1
Fork 0
mirror of https://git.videolan.org/git/ffmpeg.git synced 2024-08-07 18:14:16 +02:00
Code Releases Activity

Merge commit '8b830ee9a26d47b138f12a82085cdb372f407f1e'

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

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
This commit is contained in:
Hendrik Leppkes 2015-10-10 09:43:47 +02:00
commit 3e3779cd51
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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