virtualenv/FFmpeg
1
0
Fork 0
mirror of https://github.com/FFmpeg/FFmpeg.git synced 2024-11-26 19:01:44 +02:00
Code Issues Releases Activity

10l

Browse Source 
Commited in SoC by Bobby Bingham on 2007-12-20 20:21:19

Originally committed as revision 12712 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Vitor Sessak 2008-04-04 20:07:44 +00:00
parent 7b4708780c
commit de5985b69f
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libavfilter/avfiltergraph.c
View File

@ -412,9 +412,9 @@ static int query_formats(AVFilterContext *graphctx)
avfilter_graph_add_filter(graphctx, scale); avfilter_graph_add_filter(graphctx, scale);
scale->filter->query_formats(scale); scale->filter->query_formats(scale);
if(avfilter_merge_formats(scale-> inputs[0]->in_formats, if(!avfilter_merge_formats(scale-> inputs[0]->in_formats,
scale-> inputs[0]->out_formats) || scale-> inputs[0]->out_formats) ||
avfilter_merge_formats(scale->outputs[0]->in_formats, !avfilter_merge_formats(scale->outputs[0]->in_formats,
scale->outputs[0]->out_formats)) scale->outputs[0]->out_formats))
return -1; return -1;
} }