Fixes ticket #4924.
Found-by: Jaroslav Šnajdr <jsna...@gmail.com>
Signed-off-by: Marton Balint <c...@passwd.hu>
---
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;
--
2.1.4
_______________________________________________
ffmpeg-devel mailing list
ffmpeg-devel@ffmpeg.org
http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
