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
1895e3a2
Commit
1895e3a2
authored
Sep 02, 2016
by
Clément Bœsch
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
ffmpeg: fix broken indent/style in write_frame
parent
be07c258
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
21 additions
and
22 deletions
+21
-22
ffmpeg.c
ffmpeg.c
+21
-22
No files found.
ffmpeg.c
View file @
1895e3a2
...
...
@@ -718,8 +718,7 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
-
FFMIN3
(
pkt
->
pts
,
pkt
->
dts
,
ost
->
last_mux_dts
+
1
)
-
FFMAX3
(
pkt
->
pts
,
pkt
->
dts
,
ost
->
last_mux_dts
+
1
);
}
if
(
(
avctx
->
codec_type
==
AVMEDIA_TYPE_AUDIO
||
avctx
->
codec_type
==
AVMEDIA_TYPE_VIDEO
)
&&
if
((
avctx
->
codec_type
==
AVMEDIA_TYPE_AUDIO
||
avctx
->
codec_type
==
AVMEDIA_TYPE_VIDEO
)
&&
pkt
->
dts
!=
AV_NOPTS_VALUE
&&
!
(
avctx
->
codec_id
==
AV_CODEC_ID_VP9
&&
ost
->
stream_copy
)
&&
ost
->
last_mux_dts
!=
AV_NOPTS_VALUE
)
{
...
...
@@ -736,7 +735,7 @@ static void write_frame(AVFormatContext *s, AVPacket *pkt, OutputStream *ost)
av_log
(
s
,
loglevel
,
"changing to %"
PRId64
". This may result "
"in incorrect timestamps in the output file.
\n
"
,
max
);
if
(
pkt
->
pts
>=
pkt
->
dts
)
if
(
pkt
->
pts
>=
pkt
->
dts
)
pkt
->
pts
=
FFMAX
(
pkt
->
pts
,
max
);
pkt
->
dts
=
max
;
}
...
...
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