RepoMirrors
/
ffmpeg
mirror of https://git.ffmpeg.org/ffmpeg.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

concatdec: fix broken file_inpoint calculation 

Should fix ticket #4765.

Signed-off-by: Marton Balint <cus@passwd.hu>
This commit is contained in:
Marton Balint 2015-08-08 13:56:42 +02:00
parent ef8e5a61c8
commit 0860016529
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavformat/concatdec.c
View File

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