Commit 08600165 authored by Marton Balint's avatar Marton Balint

concatdec: fix broken file_inpoint calculation

Should fix ticket #4765.
Signed-off-by: 's avatarMarton Balint <cus@passwd.hu>
parent ef8e5a61
......@@ -315,7 +315,7 @@ static int open_file(AVFormatContext *avf, unsigned fileno)
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_inpoint = (file->file_inpoint == AV_NOPTS_VALUE) ? file->file_start_time : file->inpoint;
file->file_inpoint = (file->inpoint == AV_NOPTS_VALUE) ? file->file_start_time : file->inpoint;
if ((ret = match_streams(avf)) < 0)
return ret;
if (file->inpoint != AV_NOPTS_VALUE) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment