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
26b89f62
Commit
26b89f62
authored
May 03, 2013
by
Michael Niedermayer
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffmpeg: use a max variable to hold the maximum dts
Signed-off-by:
Michael Niedermayer
<
michaelni@gmx.at
>
parent
6b2fbdb0
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
4 additions
and
2 deletions
+4
-2
ffmpeg.c
ffmpeg.c
+4
-2
No files found.
ffmpeg.c
View file @
26b89f62
...
...
@@ -613,8 +613,9 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
if
(
!
(
s
->
oformat
->
flags
&
AVFMT_NOTIMESTAMPS
)
&&
(
avctx
->
codec_type
==
AVMEDIA_TYPE_AUDIO
||
avctx
->
codec_type
==
AVMEDIA_TYPE_VIDEO
)
&&
pkt
->
dts
!=
AV_NOPTS_VALUE
&&
ost
->
last_mux_dts
!=
AV_NOPTS_VALUE
&&
pkt
->
dts
<
ost
->
last_mux_dts
+
!
(
s
->
oformat
->
flags
&
AVFMT_TS_NONSTRICT
))
{
ost
->
last_mux_dts
!=
AV_NOPTS_VALUE
)
{
int64_t
max
=
ost
->
last_mux_dts
+
!
(
s
->
oformat
->
flags
&
AVFMT_TS_NONSTRICT
);
if
(
pkt
->
dts
<
max
)
{
av_log
(
NULL
,
AV_LOG_WARNING
,
"Non-monotonous DTS in output stream "
"%d:%d; previous: %"
PRId64
", current: %"
PRId64
"; "
,
ost
->
file_index
,
ost
->
st
->
index
,
ost
->
last_mux_dts
,
pkt
->
dts
);
...
...
@@ -628,6 +629,7 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
pkt
->
dts
=
ost
->
last_mux_dts
+
1
;
if
(
pkt
->
pts
!=
AV_NOPTS_VALUE
)
pkt
->
pts
=
FFMAX
(
pkt
->
pts
,
pkt
->
dts
);
}
}
ost
->
last_mux_dts
=
pkt
->
dts
;
...
...
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