Skip to content

F
ffmpeg.wasm-core
Commit 5ab67340 authored by Michael Niedermayer's avatar Michael Niedermayer
Browse files
Options

avfilter/avfiltergraph: dont "or" together error codes 

Signed-off-by: 's avatarMichael Niedermayer <michaelni@gmx.at>
parent b02cfad7
Hide whitespace changes
Inline Side-by-side
Showing with 3 additions and 3 deletions
libavfilter/avfiltergraph.c
View file @ 5ab67340
......@@ -564,19 +564,19 @@ static int query_formats(AVFilterGraph *graph, AVClass *log_ctx)
outlink = convert->outputs[0];
if (!ff_merge_formats( inlink->in_formats, inlink->out_formats, inlink->type) ||
!ff_merge_formats(outlink->in_formats, outlink->out_formats, outlink->type))
ret |= AVERROR(ENOSYS);
ret = AVERROR(ENOSYS);
if (inlink->type == AVMEDIA_TYPE_AUDIO &&
(!ff_merge_samplerates(inlink->in_samplerates,
inlink->out_samplerates) ||
!ff_merge_channel_layouts(inlink->in_channel_layouts,
inlink->out_channel_layouts)))
ret |= AVERROR(ENOSYS);
ret = AVERROR(ENOSYS);
if (outlink->type == AVMEDIA_TYPE_AUDIO &&
(!ff_merge_samplerates(outlink->in_samplerates,
outlink->out_samplerates) ||
!ff_merge_channel_layouts(outlink->in_channel_layouts,
outlink->out_channel_layouts)))
ret |= AVERROR(ENOSYS);
ret = AVERROR(ENOSYS);
if (ret < 0) {
av_log(log_ctx, AV_LOG_ERROR,
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment