virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-12-23 12:43:46 +02:00
Code Issues Releases Activity

avfiltergraph: call query_formats on inputs first.

Browse Source 
This is a temporary workaround for amerge,
until format renegociation is implemented.

Should fix trac ticket #1400.
This commit is contained in:
Nicolas George 2012-06-03 21:53:22 +02:00
parent 6a4c5c730e
commit aba8065adb
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libavfilter/avfiltergraph.c
View File

@ -235,8 +235,14 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx)
AVFilterFormats *samplerates; AVFilterFormats *samplerates;
int scaler_count = 0, resampler_count = 0; int scaler_count = 0, resampler_count = 0;
for (j = 0; j < 2; j++) {
/* ask all the sub-filters for their supported media formats */ /* ask all the sub-filters for their supported media formats */
for (i = 0; i < graph->filter_count; i++) { for (i = 0; i < graph->filter_count; i++) {
/* Call query_formats on sources first.
This is a temporary workaround for amerge,
until format renegociation is implemented. */
if (!graph->filters[i]->input_count == j)
continue;
if (graph->filters[i]->filter->query_formats) if (graph->filters[i]->filter->query_formats)
ret = graph->filters[i]->filter->query_formats(graph->filters[i]); ret = graph->filters[i]->filter->query_formats(graph->filters[i]);
else else
@ -244,6 +250,7 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx)
if (ret < 0) if (ret < 0)
return ret; return ret;
} }
}
/* go through and merge as many format lists as possible */ /* go through and merge as many format lists as possible */
for (i = 0; i < graph->filter_count; i++) { for (i = 0; i < graph->filter_count; i++) {