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
a9b5af0d
Commit
a9b5af0d
authored
May 24, 2019
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avfilter/vf_mix: use time_base from framesync
parent
1d74150a
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
3 deletions
+4
-3
vf_mix.c
libavfilter/vf_mix.c
+4
-3
No files found.
libavfilter/vf_mix.c
View file @
a9b5af0d
...
...
@@ -217,7 +217,6 @@ static int config_output(AVFilterLink *outlink)
{
AVFilterContext
*
ctx
=
outlink
->
src
;
MixContext
*
s
=
ctx
->
priv
;
AVRational
time_base
=
ctx
->
inputs
[
0
]
->
time_base
;
AVRational
frame_rate
=
ctx
->
inputs
[
0
]
->
frame_rate
;
AVFilterLink
*
inlink
=
ctx
->
inputs
[
0
];
int
height
=
ctx
->
inputs
[
0
]
->
h
;
...
...
@@ -252,7 +251,6 @@ static int config_output(AVFilterLink *outlink)
outlink
->
w
=
width
;
outlink
->
h
=
height
;
outlink
->
time_base
=
time_base
;
outlink
->
frame_rate
=
frame_rate
;
if
((
ret
=
ff_framesync_init
(
&
s
->
fs
,
ctx
,
s
->
nb_inputs
))
<
0
)
...
...
@@ -271,7 +269,10 @@ static int config_output(AVFilterLink *outlink)
in
[
i
].
after
=
(
s
->
duration
==
1
||
(
s
->
duration
==
2
&&
i
==
0
))
?
EXT_STOP
:
EXT_INFINITY
;
}
return
ff_framesync_configure
(
&
s
->
fs
);
ret
=
ff_framesync_configure
(
&
s
->
fs
);
outlink
->
time_base
=
s
->
fs
.
time_base
;
return
ret
;
}
static
av_cold
void
uninit
(
AVFilterContext
*
ctx
)
...
...
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