Skip to content
Projects
Groups
Snippets
Help
Loading...
Sign in / Register
Toggle navigation
F
ffmpeg
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
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
submodule
ffmpeg
Commits
b32f8659
Commit
b32f8659
authored
Apr 27, 2018
by
Rodger Combs
Committed by
Karthick Jeyapal
May 04, 2018
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
lavf/dashenc: don't call flush_init_segment before avformat_write_header
Fixes crash when muxing MKV-in-DASH
parent
d89eea34
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
7 deletions
+6
-7
dashenc.c
libavformat/dashenc.c
+6
-7
No files found.
libavformat/dashenc.c
View file @
b32f8659
...
...
@@ -988,13 +988,6 @@ static int dash_init(AVFormatContext *s)
av_log
(
s
,
AV_LOG_VERBOSE
,
"Representation %d init segment will be written to: %s
\n
"
,
i
,
filename
);
// Flush init segment
// except for mp4, since delay_moov is set and the init segment
// is then flushed after the first packets
if
(
strcmp
(
os
->
format_name
,
"mp4"
))
{
flush_init_segment
(
s
,
os
);
}
s
->
streams
[
i
]
->
time_base
=
st
->
time_base
;
// If the muxer wants to shift timestamps, request to have them shifted
// already before being handed to this muxer, so we don't have mismatches
...
...
@@ -1035,6 +1028,12 @@ static int dash_write_header(AVFormatContext *s)
OutputStream
*
os
=
&
c
->
streams
[
i
];
if
((
ret
=
avformat_write_header
(
os
->
ctx
,
NULL
))
<
0
)
return
ret
;
// Flush init segment
// Only for WebM segment, since for mp4 delay_moov is set and
// the init segment is thus flushed after the first packets.
if
(
strcmp
(
os
->
format_name
,
"mp4"
)
&&
(
ret
=
flush_init_segment
(
s
,
os
))
<
0
)
return
ret
;
}
ret
=
write_manifest
(
s
,
0
);
if
(
!
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