Chiebot-Mirror
/
FFmpeg
8
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

concatdec: fix broken file_inpoint calculation

Browse Source 
Should fix ticket #4765.

Signed-off-by: Marton Balint <cus@passwd.hu>
pull/161/head^2
Marton Balint 10 years ago
parent ef8e5a61c8
commit 0860016529
1 changed files with 1 additions and 1 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libavformat/concatdec.c

2
libavformat/concatdec.c
Unescape 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) {

Write Preview
Loading…
Cancel
Save