[FFmpeg-devel] [PATCH] avformat: PTS/DTS timestamps get broken in concat

[Jaroslav Snajdr]

Another attempt at trac #4924: use cat->avf->start_time to setup opened 
file structure in concatdec.c. This field always contains the correct 
timestamp.

---
  libavformat/concatdec.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index 832b7f4..7686f28 100644
--- a/libavformat/concatdec.c
+++ b/libavformat/concatdec.c
@@ -314,7 +314,7 @@ static int open_file(AVFormatContext *avf, unsigned 
fileno)
          file->start_time = !fileno ? 0 :
                             cat->files[fileno - 1].start_time +
                             cat->files[fileno - 1].duration;
-    file->file_start_time = (avf->start_time == AV_NOPTS_VALUE) ? 0 : 
avf->start_time;
+    file->file_start_time = (cat->avf->start_time == AV_NOPTS_VALUE) ? 
0 : cat->avf->start_time;
      file->file_inpoint = (file->inpoint == AV_NOPTS_VALUE) ? 
file->file_start_time : file->inpoint;
      if ((ret = match_streams(avf)) < 0)
          return ret;
--