diff options
| author | Marton Balint <cus@passwd.hu> | 2015-11-09 23:49:25 +0100 |
|---|---|---|
| committer | Marton Balint <cus@passwd.hu> | 2015-11-25 00:34:29 +0100 |
| commit | ba9191ab3a51e2127ecf915dc0d803500b7cbcf0 (patch) | |
| tree | b3eb1449cbf8aa0cf8d075e865ba4ea62e167ea5 /libavformat | |
| parent | 8f60663c8b71306b4d3e4e41275c3548848af2d7 (diff) | |
| download | ffmpeg-ba9191ab3a51e2127ecf915dc0d803500b7cbcf0.tar.gz | |
concatdec: simplify duration calculation in open_next_file
If duration is still AV_NOPTS_VALUE when opening the next file, we can assume
that outpoint is not set.
Reviewed-by: Nicolas George <george@nsup.org>
Signed-off-by: Marton Balint <cus@passwd.hu>
Diffstat (limited to 'libavformat')
| -rw-r--r-- | libavformat/concatdec.c | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index 560aa643cf..169394122f 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -471,13 +471,8 @@ static int open_next_file(AVFormatContext *avf) ConcatContext *cat = avf->priv_data; unsigned fileno = cat->cur_file - cat->files; - if (cat->cur_file->duration == AV_NOPTS_VALUE) { - cat->cur_file->duration = cat->avf->duration; - if (cat->cur_file->inpoint != AV_NOPTS_VALUE) - cat->cur_file->duration -= (cat->cur_file->inpoint - cat->cur_file->file_start_time); - if (cat->cur_file->outpoint != AV_NOPTS_VALUE) - cat->cur_file->duration -= cat->avf->duration - (cat->cur_file->outpoint - cat->cur_file->file_start_time); - } + if (cat->cur_file->duration == AV_NOPTS_VALUE) + cat->cur_file->duration = cat->avf->duration - (cat->cur_file->file_inpoint - cat->cur_file->file_start_time); if (++fileno >= cat->nb_files) { cat->eof = 1; |