diff options
| author | Marton Balint <cus@passwd.hu> | 2015-10-13 22:56:00 +0200 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2015-10-17 18:38:52 +0200 |
| commit | df239b76195156f179618ddb8b167d5bf1245247 (patch) | |
| tree | 0e62d2fea243f27f3beb6e7dff6180afb45c6d11 /libavformat/concatdec.c | |
| parent | 01790484c130ee6f390a31356906b7337949ef05 (diff) | |
| download | ffmpeg-df239b76195156f179618ddb8b167d5bf1245247.tar.gz | |
concatdec: fix file_start_time calculation regression
Fixes ticket #4924.
Found-by: Jaroslav Šnajdr <jsnajdr@gmail.com>
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavformat/concatdec.c')
| -rw-r--r-- | libavformat/concatdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
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; |