]> rtime.felk.cvut.cz Git - frescor/ffmpeg.git/commitdiff
10l
authorvitor <vitor@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Fri, 4 Apr 2008 20:07:44 +0000 (20:07 +0000)
committervitor <vitor@9553f0bf-9b14-0410-a0b8-cfaf0461ba5b>
Fri, 4 Apr 2008 20:07:44 +0000 (20:07 +0000)
Commited in SoC by Bobby Bingham on 2007-12-20 20:21:19

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@12712 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b

libavfilter/avfiltergraph.c

index 665f80e600e3e6f8766c0b87f7f8ca44d5377481..98e14661f326cb76b5be803ad0f799eb50f422c4 100644 (file)
@@ -412,9 +412,9 @@ static int query_formats(AVFilterContext *graphctx)
 
                     avfilter_graph_add_filter(graphctx, 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) ||
-                       avfilter_merge_formats(scale->outputs[0]->in_formats,
+                       !avfilter_merge_formats(scale->outputs[0]->in_formats,
                                               scale->outputs[0]->out_formats))
                         return -1;
                 }