Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
F
ffmpeg
Project
Project
Details
Activity
Releases
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
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Stefan Westerfeld
ffmpeg
Commits
789731af
Commit
789731af
authored
Nov 12, 2017
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avfilter/vf_maskedmerge: ignore SAR from all inputs
Signed-off-by:
Paul B Mahol
<
onemda@gmail.com
>
parent
a28e70be
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
18 deletions
+6
-18
vf_maskedmerge.c
libavfilter/vf_maskedmerge.c
+6
-18
No files found.
libavfilter/vf_maskedmerge.c
View file @
789731af
...
...
@@ -199,27 +199,15 @@ static int config_output(AVFilterLink *outlink)
av_log
(
ctx
,
AV_LOG_ERROR
,
"inputs must be of same pixel format
\n
"
);
return
AVERROR
(
EINVAL
);
}
if
(
base
->
w
!=
overlay
->
w
||
base
->
h
!=
overlay
->
h
||
base
->
sample_aspect_ratio
.
num
!=
overlay
->
sample_aspect_ratio
.
num
||
base
->
sample_aspect_ratio
.
den
!=
overlay
->
sample_aspect_ratio
.
den
||
base
->
w
!=
mask
->
w
||
base
->
h
!=
mask
->
h
||
base
->
sample_aspect_ratio
.
num
!=
mask
->
sample_aspect_ratio
.
num
||
base
->
sample_aspect_ratio
.
den
!=
mask
->
sample_aspect_ratio
.
den
)
{
if
(
base
->
w
!=
overlay
->
w
||
base
->
h
!=
overlay
->
h
||
base
->
w
!=
mask
->
w
||
base
->
h
!=
mask
->
h
)
{
av_log
(
ctx
,
AV_LOG_ERROR
,
"First input link %s parameters "
"(size %dx%d
, SAR %d:%d
) do not match the corresponding "
"second input link %s parameters (
%dx%d, SAR %d:
%d) "
"and/or third input link %s parameters (
%dx%d, SAR %d:
%d)
\n
"
,
"(size %dx%d) do not match the corresponding "
"second input link %s parameters (
size %dx
%d) "
"and/or third input link %s parameters (
size %dx
%d)
\n
"
,
ctx
->
input_pads
[
0
].
name
,
base
->
w
,
base
->
h
,
base
->
sample_aspect_ratio
.
num
,
base
->
sample_aspect_ratio
.
den
,
ctx
->
input_pads
[
1
].
name
,
overlay
->
w
,
overlay
->
h
,
overlay
->
sample_aspect_ratio
.
num
,
overlay
->
sample_aspect_ratio
.
den
,
ctx
->
input_pads
[
2
].
name
,
mask
->
w
,
mask
->
h
,
mask
->
sample_aspect_ratio
.
num
,
mask
->
sample_aspect_ratio
.
den
);
ctx
->
input_pads
[
2
].
name
,
mask
->
w
,
mask
->
h
);
return
AVERROR
(
EINVAL
);
}
...
...
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