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
0da28d68
Commit
0da28d68
authored
May 23, 2012
by
Nicolas George
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
af_amerge: compute output timestamp.
Use the timestamps from the first input.
parent
e6aee467
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
5 additions
and
0 deletions
+5
-0
af_amerge.c
libavfilter/af_amerge.c
+5
-0
No files found.
libavfilter/af_amerge.c
View file @
0da28d68
...
...
@@ -216,6 +216,11 @@ static void filter_samples(AVFilterLink *inlink, AVFilterBufferRef *insamples)
ins
[
i
]
=
(
*
inbuf
[
i
])
->
data
[
0
]
+
am
->
queue
[
i
].
pos
*
am
->
nb_in_ch
[
i
]
*
am
->
bps
;
}
outbuf
->
pts
=
(
*
inbuf
[
0
])
->
pts
==
AV_NOPTS_VALUE
?
AV_NOPTS_VALUE
:
(
*
inbuf
[
0
])
->
pts
+
av_rescale_q
(
am
->
queue
[
0
].
pos
,
(
AVRational
){
1
,
ctx
->
inputs
[
0
]
->
sample_rate
},
ctx
->
outputs
[
0
]
->
time_base
);
avfilter_copy_buffer_ref_props
(
outbuf
,
*
inbuf
[
0
]);
outbuf
->
audio
->
nb_samples
=
nb_samples
;
...
...
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