Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
F
ffmpeg.wasm-core
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Linshizhi
ffmpeg.wasm-core
Commits
5ab67340
Commit
5ab67340
authored
Jul 02, 2014
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avfilter/avfiltergraph: dont "or" together error codes
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
b02cfad7
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
3 deletions
+3
-3
avfiltergraph.c
libavfilter/avfiltergraph.c
+3
-3
No files found.
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
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment