]> git.sesse.net Git - ffmpeg/commitdiff
avformat/concatdec: fix cur_dts based duration calculation with nonzero stream start_time
authorMarton Balint <cus@passwd.hu>
Wed, 21 Nov 2018 23:59:04 +0000 (00:59 +0100)
committerMarton Balint <cus@passwd.hu>
Tue, 22 Jan 2019 19:14:11 +0000 (20:14 +0100)
Signed-off-by: Marton Balint <cus@passwd.hu>
libavformat/concatdec.c

index 3c2799aa1b4799410cfef314c83dd08c5b89002f..890a220a89ec73a80babc0ce8f29a6a3dd97a0fc 100644 (file)
@@ -325,7 +325,7 @@ static int64_t get_best_effort_duration(ConcatFile *file, AVFormatContext *avf)
     if (avf->duration > 0)
         return avf->duration - (file->file_inpoint - file->file_start_time);
     if (file->next_dts != AV_NOPTS_VALUE)
-        return file->next_dts - (file->file_inpoint - file->file_start_time);
+        return file->next_dts - file->file_inpoint;
     return AV_NOPTS_VALUE;
 }