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
225341b2
Commit
225341b2
authored
Dec 02, 2017
by
Paul B Mahol
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
avfilter/vf_stack: always copy SAR from first input
Signed-off-by:
Paul B Mahol
<
onemda@gmail.com
>
parent
00d454ed
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
3 additions
and
0 deletions
+3
-0
vf_stack.c
libavfilter/vf_stack.c
+3
-0
No files found.
libavfilter/vf_stack.c
View file @
225341b2
...
@@ -105,6 +105,7 @@ static int process_frame(FFFrameSync *fs)
...
@@ -105,6 +105,7 @@ static int process_frame(FFFrameSync *fs)
if
(
!
out
)
if
(
!
out
)
return
AVERROR
(
ENOMEM
);
return
AVERROR
(
ENOMEM
);
out
->
pts
=
av_rescale_q
(
s
->
fs
.
pts
,
s
->
fs
.
time_base
,
outlink
->
time_base
);
out
->
pts
=
av_rescale_q
(
s
->
fs
.
pts
,
s
->
fs
.
time_base
,
outlink
->
time_base
);
out
->
sample_aspect_ratio
=
outlink
->
sample_aspect_ratio
;
for
(
i
=
0
;
i
<
s
->
nb_inputs
;
i
++
)
{
for
(
i
=
0
;
i
<
s
->
nb_inputs
;
i
++
)
{
AVFilterLink
*
inlink
=
ctx
->
inputs
[
i
];
AVFilterLink
*
inlink
=
ctx
->
inputs
[
i
];
...
@@ -147,6 +148,7 @@ static int config_output(AVFilterLink *outlink)
...
@@ -147,6 +148,7 @@ static int config_output(AVFilterLink *outlink)
StackContext
*
s
=
ctx
->
priv
;
StackContext
*
s
=
ctx
->
priv
;
AVRational
time_base
=
ctx
->
inputs
[
0
]
->
time_base
;
AVRational
time_base
=
ctx
->
inputs
[
0
]
->
time_base
;
AVRational
frame_rate
=
ctx
->
inputs
[
0
]
->
frame_rate
;
AVRational
frame_rate
=
ctx
->
inputs
[
0
]
->
frame_rate
;
AVRational
sar
=
ctx
->
inputs
[
0
]
->
sample_aspect_ratio
;
int
height
=
ctx
->
inputs
[
0
]
->
h
;
int
height
=
ctx
->
inputs
[
0
]
->
h
;
int
width
=
ctx
->
inputs
[
0
]
->
w
;
int
width
=
ctx
->
inputs
[
0
]
->
w
;
FFFrameSyncIn
*
in
;
FFFrameSyncIn
*
in
;
...
@@ -179,6 +181,7 @@ static int config_output(AVFilterLink *outlink)
...
@@ -179,6 +181,7 @@ static int config_output(AVFilterLink *outlink)
outlink
->
h
=
height
;
outlink
->
h
=
height
;
outlink
->
time_base
=
time_base
;
outlink
->
time_base
=
time_base
;
outlink
->
frame_rate
=
frame_rate
;
outlink
->
frame_rate
=
frame_rate
;
outlink
->
sample_aspect_ratio
=
sar
;
if
((
ret
=
ff_framesync_init
(
&
s
->
fs
,
ctx
,
s
->
nb_inputs
))
<
0
)
if
((
ret
=
ff_framesync_init
(
&
s
->
fs
,
ctx
,
s
->
nb_inputs
))
<
0
)
return
ret
;
return
ret
;
...
...
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