diff options
| author | Marton Balint <cus@passwd.hu> | 2015-08-08 13:56:42 +0200 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2015-08-11 11:19:17 +0200 |
| commit | 086001652982db6c22bcff30e122ebe8229a1d85 (patch) | |
| tree | 774881808c04771091f163d24fe6afb617eb7adf /libavformat/concatdec.c | |
| parent | ef8e5a61c85d54139c624468bc6e11fbb55bfbbf (diff) | |
| download | ffmpeg-086001652982db6c22bcff30e122ebe8229a1d85.tar.gz | |
concatdec: fix broken file_inpoint calculation
Should fix ticket #4765.
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavformat/concatdec.c')
| -rw-r--r-- | libavformat/concatdec.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index 1fe294be19..969b001551 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -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) { |