Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
f21d0beb
Commit
f21d0beb
authored
Feb 07, 2014
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix a few heigth/height typo.
parent
6ef57f4d
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
filters.texi
doc/filters.texi
+2
-2
vf_psnr.c
libavfilter/vf_psnr.c
+1
-1
No files found.
doc/filters.texi
View file @
f21d0beb
...
@@ -6786,11 +6786,11 @@ pixel format "yuv422p" @var{hsub} is 2 and @var{vsub} is 1.
...
@@ -6786,11 +6786,11 @@ pixel format "yuv422p" @var{hsub} is 2 and @var{vsub} is 1.
@item in_w, iw
@item in_w, iw
@item in_h, ih
@item in_h, ih
the input video width and heig
th
the input video width and heig
ht
@item out_w, ow
@item out_w, ow
@item out_h, oh
@item out_h, oh
the output width and heig
th
, that is the size of the padded area as
the output width and heig
ht
, that is the size of the padded area as
specified by the @var{width} and @var{height} expressions
specified by the @var{width} and @var{height} expressions
@item rotw(a)
@item rotw(a)
...
...
libavfilter/vf_psnr.c
View file @
f21d0beb
...
@@ -246,7 +246,7 @@ static int config_input_ref(AVFilterLink *inlink)
...
@@ -246,7 +246,7 @@ static int config_input_ref(AVFilterLink *inlink)
s
->
nb_components
=
desc
->
nb_components
;
s
->
nb_components
=
desc
->
nb_components
;
if
(
ctx
->
inputs
[
0
]
->
w
!=
ctx
->
inputs
[
1
]
->
w
||
if
(
ctx
->
inputs
[
0
]
->
w
!=
ctx
->
inputs
[
1
]
->
w
||
ctx
->
inputs
[
0
]
->
h
!=
ctx
->
inputs
[
1
]
->
h
)
{
ctx
->
inputs
[
0
]
->
h
!=
ctx
->
inputs
[
1
]
->
h
)
{
av_log
(
ctx
,
AV_LOG_ERROR
,
"Width and heig
th
of input videos must be same.
\n
"
);
av_log
(
ctx
,
AV_LOG_ERROR
,
"Width and heig
ht
of input videos must be same.
\n
"
);
return
AVERROR
(
EINVAL
);
return
AVERROR
(
EINVAL
);
}
}
if
(
ctx
->
inputs
[
0
]
->
format
!=
ctx
->
inputs
[
1
]
->
format
)
{
if
(
ctx
->
inputs
[
0
]
->
format
!=
ctx
->
inputs
[
1
]
->
format
)
{
...
...
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