[FFmpeg-cvslog] dashenc: Fix writing of timelines that don't start at t=0

Martin Storsjö git at videolan.org
Tue Dec 30 01:57:19 CET 2014


ffmpeg | branch: master | Martin Storsjö <martin at martin.st> | Mon Dec 29 15:39:23 2014 +0200| [b91a5757fcbf723da99b05b298a6f820271dbc2b] | committer: Martin Storsjö

dashenc: Fix writing of timelines that don't start at t=0

When writing an explicit time, reset the cur_time variable to this
value as well. This avoids writing excessive time attributes for each
segment in the timeline, as long as the segments are continuous.

Signed-off-by: Martin Storsjö <martin at martin.st>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=b91a5757fcbf723da99b05b298a6f820271dbc2b
---

 libavformat/dashenc.c |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/libavformat/dashenc.c b/libavformat/dashenc.c
index b4fd194..7dd08ec 100644
--- a/libavformat/dashenc.c
+++ b/libavformat/dashenc.c
@@ -214,8 +214,10 @@ static void output_segment_list(OutputStream *os, AVIOContext *out, DASHContext
                 Segment *seg = os->segments[i];
                 int repeat = 0;
                 avio_printf(out, "\t\t\t\t\t\t<S ");
-                if (i == start_index || seg->time != cur_time)
+                if (i == start_index || seg->time != cur_time) {
+                    cur_time = seg->time;
                     avio_printf(out, "t=\"%"PRId64"\" ", seg->time);
+                }
                 avio_printf(out, "d=\"%d\" ", seg->duration);
                 while (i + repeat + 1 < os->nb_segments &&
                        os->segments[i + repeat + 1]->duration == seg->duration &&



More information about the ffmpeg-cvslog mailing list