diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-07-03 01:37:00 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-07-03 02:29:49 +0200 |
| commit | 5ab67340f9d1ac79961a356d30a9967bb05b2c13 (patch) | |
| tree | b63585c6d7f0b6c12b23cd17eb040b689e0c8745 /libavfilter | |
| parent | b02cfad7d2de192d95149b73c7915a965ef6e2db (diff) | |
| download | ffmpeg-streaming-5ab67340f9d1ac79961a356d30a9967bb05b2c13.zip ffmpeg-streaming-5ab67340f9d1ac79961a356d30a9967bb05b2c13.tar.gz | |
avfilter/avfiltergraph: dont "or" together error codes
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/avfiltergraph.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavfilter/avfiltergraph.c b/libavfilter/avfiltergraph.c index 47b5b72..f12491e 100644 --- a/libavfilter/avfiltergraph.c +++ b/libavfilter/avfiltergraph.c @@ -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, |
