ffmpeg | branch: master | Marton Balint <c...@passwd.hu> | Tue Oct 13 22:56:00 2015 +0200| [df239b76195156f179618ddb8b167d5bf1245247] | committer: Marton Balint
concatdec: fix file_start_time calculation regression Fixes ticket #4924. Found-by: Jaroslav Šnajdr <jsna...@gmail.com> Reviewed-by: Nicolas George <geo...@nsup.org> Signed-off-by: Marton Balint <c...@passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=df239b76195156f179618ddb8b167d5bf1245247 --- 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; _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
