[FFmpeg-cvslog] lavf/concat: compute duration if possible.

[Nicolas George]

ffmpeg | branch: master | Nicolas George <nicolas.george at normalesup.org> | Wed Feb 13 19:25:26 2013 +0100| [c31458c334b6328899d9ebe83150a55609784dfd] | committer: Nicolas George

lavf/concat: compute duration if possible.

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

 libavformat/concatdec.c |   13 +++++++++++++
 1 file changed, 13 insertions(+)

diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index 2858bef..a9fcc76 100644
--- a/libavformat/concatdec.c
+++ b/libavformat/concatdec.c
@@ -157,6 +157,7 @@ static int concat_read_header(AVFormatContext *avf)
     unsigned nb_files_alloc = 0;
     ConcatFile *file = NULL;
     AVStream *st, *source_st;
+    int64_t time = 0;
 
     while (1) {
         if ((ret = ff_get_line(avf->pb, buf, sizeof(buf))) <= 0)
@@ -207,6 +208,18 @@ static int concat_read_header(AVFormatContext *avf)
     if (ret < 0)
         FAIL(ret);
 
+    for (i = 0; i < cat->nb_files; i++) {
+        if (cat->files[i].start_time == AV_NOPTS_VALUE)
+            cat->files[i].start_time = time;
+        else
+            time = cat->files[i].start_time;
+        if (cat->files[i].duration == AV_NOPTS_VALUE)
+            break;
+        time += cat->files[i].duration;
+    }
+    if (i == cat->nb_files)
+        avf->duration = time;
+
     if ((ret = open_file(avf, 0)) < 0)
         FAIL(ret);
     for (i = 0; i < cat->avf->nb_streams; i++) {