From df239b76195156f179618ddb8b167d5bf1245247 Mon Sep 17 00:00:00 2001 From: Marton Balint Date: Tue, 13 Oct 2015 22:56:00 +0200 Subject: [PATCH] concatdec: fix file_start_time calculation regression MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Fixes ticket #4924. Found-by: Jaroslav Šnajdr Reviewed-by: Nicolas George Signed-off-by: Marton Balint --- libavformat/concatdec.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index 832b7f4b9c..7686f28c62 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;