diff options
| author | Vitor Sessak <vitor1001@gmail.com> | 2008-04-04 20:07:44 +0000 |
|---|---|---|
| committer | Vitor Sessak <vitor1001@gmail.com> | 2008-04-04 20:07:44 +0000 |
| commit | de5985b69fb7c15760c8672e258650a104241522 (patch) | |
| tree | 851dfaefd9cbe764df8bdc9df50f82805bec9ac6 /libavfilter/avfiltergraph.c | |
| parent | 7b4708780c6d6e9ec937b3148ce5df42ec55fd08 (diff) | |
| download | ffmpeg-de5985b69fb7c15760c8672e258650a104241522.tar.gz | |
10l
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
Diffstat (limited to 'libavfilter/avfiltergraph.c')
| -rw-r--r-- | libavfilter/avfiltergraph.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 665f80e600..98e14661f3 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -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; } |