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
52e7f6b1
Commit
52e7f6b1
authored
Dec 16, 2015
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Revert "avfilter/vf_decimate: Check that input parameters match"
ill commit a better solution This reverts commit
30fe3fd5
.
parent
4a7c705f
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
0 additions
and
9 deletions
+0
-9
vf_decimate.c
libavfilter/vf_decimate.c
+0
-9
No files found.
libavfilter/vf_decimate.c
View file @
52e7f6b1
...
...
@@ -365,8 +365,6 @@ static int config_output(AVFilterLink *outlink)
DecimateContext
*
dm
=
ctx
->
priv
;
const
AVFilterLink
*
inlink
=
ctx
->
inputs
[
dm
->
ppsrc
?
INPUT_CLEANSRC
:
INPUT_MAIN
];
const
AVFilterLink
*
inlink_main
=
ctx
->
inputs
[
INPUT_MAIN
];
AVRational
fps
=
inlink
->
frame_rate
;
if
(
!
fps
.
num
||
!
fps
.
den
)
{
...
...
@@ -374,13 +372,6 @@ static int config_output(AVFilterLink *outlink)
"current rate of %d/%d is invalid
\n
"
,
fps
.
num
,
fps
.
den
);
return
AVERROR
(
EINVAL
);
}
if
(
inlink
->
w
!=
inlink_main
->
w
||
inlink
->
h
!=
inlink_main
->
h
||
inlink
->
format
!=
inlink_main
->
format
)
{
av_log
(
ctx
,
AV_LOG_ERROR
,
"frame parameters differ between inputs
\n
"
);
return
AVERROR_PATCHWELCOME
;
}
fps
=
av_mul_q
(
fps
,
(
AVRational
){
dm
->
cycle
-
1
,
dm
->
cycle
});
av_log
(
ctx
,
AV_LOG_VERBOSE
,
"FPS: %d/%d -> %d/%d
\n
"
,
inlink
->
frame_rate
.
num
,
inlink
->
frame_rate
.
den
,
fps
.
num
,
fps
.
den
);
...
...
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