diff options
Diffstat (limited to 'libavformat/dashenc.c')
| -rw-r--r-- | libavformat/dashenc.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c index a55cd67cc0..b4fd1949e7 100644 --- a/libavformat/dashenc.c +++ b/libavformat/dashenc.c @@ -652,6 +652,7 @@ static int dash_write_header(AVFormatContext *s) set_codec_str(s, os->ctx->streams[0]->codec, os->codec_str, sizeof(os->codec_str)); os->first_dts = AV_NOPTS_VALUE; + os->end_dts = AV_NOPTS_VALUE; os->segment_index = 1; } @@ -861,8 +862,15 @@ static int dash_write_packet(AVFormatContext *s, AVPacket *pkt) return ret; } - if (!os->packets_written) - os->start_dts = pkt->dts; + if (!os->packets_written) { + // If we wrote a previous segment, adjust the start time of the segment + // to the end of the previous one (which is the same as the mp4 muxer + // does). This avoids gaps in the timeline. + if (os->end_dts != AV_NOPTS_VALUE) + os->start_dts = os->end_dts; + else + os->start_dts = pkt->dts; + } os->end_dts = pkt->dts + pkt->duration; os->packets_written++; return ff_write_chained(os->ctx, 0, pkt, s); |