highperfocused/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

concatdec: calculate duration early if outpoint is known

Browse Source 
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint
2015-10-24 16:20:41 +02:00
parent 4ea4d2f438
commit 8f60663c8b
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/concatdec.c
View File

@ -316,6 +316,8 @@ static int open_file(AVFormatContext *avf, unsigned fileno)
cat->files[fileno - 1].duration; cat->files[fileno - 1].duration;
file->file_start_time = (cat->avf->start_time == AV_NOPTS_VALUE) ? 0 : cat->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; file->file_inpoint = (file->inpoint == AV_NOPTS_VALUE) ? file->file_start_time : file->inpoint;
if (file->duration == AV_NOPTS_VALUE && file->outpoint != AV_NOPTS_VALUE)
file->duration = file->outpoint - file->file_inpoint;
if ((ret = match_streams(avf)) < 0) if ((ret = match_streams(avf)) < 0)
return ret; return ret;
if (file->inpoint != AV_NOPTS_VALUE) { if (file->inpoint != AV_NOPTS_VALUE) {