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
c0dc57f1
Commit
c0dc57f1
authored
Dec 13, 2012
by
Justin Ruggles
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
asyncts: merge two conditions
parent
0995ad8d
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
7 deletions
+2
-7
af_asyncts.c
libavfilter/af_asyncts.c
+2
-7
No files found.
libavfilter/af_asyncts.c
View file @
c0dc57f1
...
@@ -196,19 +196,14 @@ static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *buf)
...
@@ -196,19 +196,14 @@ static int filter_frame(AVFilterLink *inlink, AVFilterBufferRef *buf)
int
out_size
,
ret
;
int
out_size
,
ret
;
int64_t
delta
;
int64_t
delta
;
/* buffer data until we get the
firs
t timestamp */
/* buffer data until we get the
nex
t timestamp */
if
(
s
->
pts
==
AV_NOPTS_VALUE
)
{
if
(
s
->
pts
==
AV_NOPTS_VALUE
||
pts
==
AV_NOPTS_VALUE
)
{
if
(
pts
!=
AV_NOPTS_VALUE
)
{
if
(
pts
!=
AV_NOPTS_VALUE
)
{
s
->
pts
=
pts
-
get_delay
(
s
);
s
->
pts
=
pts
-
get_delay
(
s
);
}
}
return
write_to_fifo
(
s
,
buf
);
return
write_to_fifo
(
s
,
buf
);
}
}
/* now wait for the next timestamp */
if
(
pts
==
AV_NOPTS_VALUE
)
{
return
write_to_fifo
(
s
,
buf
);
}
if
(
s
->
first_pts
!=
AV_NOPTS_VALUE
)
{
if
(
s
->
first_pts
!=
AV_NOPTS_VALUE
)
{
handle_trimming
(
ctx
);
handle_trimming
(
ctx
);
if
(
!
avresample_available
(
s
->
avr
))
if
(
!
avresample_available
(
s
->
avr
))
...
...
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