ffmpeg | branch: master | Rodger Combs <rodger.co...@gmail.com> | Fri Apr 27 03:51:35 2018 +0300| [6f119dc32176e191c7fc796d4c4ca06c7be4ea71] | committer: Karthick Jeyapal
lavf/dashenc: don't call flush_init_segment before avformat_write_header Fixes crash when muxing MKV-in-DASH > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=6f119dc32176e191c7fc796d4c4ca06c7be4ea71 --- libavformat/dashenc.c | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index 211ef23cb0..4f8f61b704 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -1026,13 +1026,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 @@ -1074,6 +1067,13 @@ 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; } return ret; } _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
