Browse Source

concatdec: fix broken file_inpoint calculation

Should fix ticket #4765.

Signed-off-by: Marton Balint <cus@passwd.hu>
tags/n2.8
Marton Balint 10 years ago
parent
commit
0860016529
1 changed files with 1 additions and 1 deletions
  1. +1
    -1
      libavformat/concatdec.c

+ 1
- 1
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].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) {


Loading…
Cancel
Save