aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarton Balint <cus@passwd.hu>2018-11-22 00:59:04 +0100
committerMarton Balint <cus@passwd.hu>2019-01-22 20:14:11 +0100
commit679cbd8f18719f470f7107ed0a7fbef1905ee85a (patch)
tree097f3cfdbd8fbca1c2ba554a03bd809ad60d22c9
parent0a98622cbef13fb5227978cccc9084ad6d3e4eac (diff)
downloadffmpeg-679cbd8f18719f470f7107ed0a7fbef1905ee85a.tar.gz
avformat/concatdec: fix cur_dts based duration calculation with nonzero stream start_time
Signed-off-by: Marton Balint <cus@passwd.hu>
-rw-r--r--libavformat/concatdec.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index 3c2799aa1b..890a220a89 100644
--- a/libavformat/concatdec.c
+++ b/libavformat/concatdec.c
@@ -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;
}