ffmpeg | branch: master | Marton Balint <c...@passwd.hu> | Sat Oct 24 16:20:41 2015 +0200| [8f60663c8b71306b4d3e4e41275c3548848af2d7] | committer: Marton Balint
concatdec: calculate duration early if outpoint is known Reviewed-by: Nicolas George <geo...@nsup.org> Signed-off-by: Marton Balint <c...@passwd.hu> > http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=8f60663c8b71306b4d3e4e41275c3548848af2d7 --- libavformat/concatdec.c | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c index 0180a7e..560aa64 100644 --- a/libavformat/concatdec.c +++ b/libavformat/concatdec.c @@ -316,6 +316,8 @@ static int open_file(AVFormatContext *avf, unsigned fileno) cat->files[fileno - 1].duration; file->file_start_time = (cat->avf->start_time == AV_NOPTS_VALUE) ? 0 : cat->avf->start_time; file->file_inpoint = (file->inpoint == AV_NOPTS_VALUE) ? file->file_start_time : file->inpoint; + if (file->duration == AV_NOPTS_VALUE && file->outpoint != AV_NOPTS_VALUE) + file->duration = file->outpoint - file->file_inpoint; if ((ret = match_streams(avf)) < 0) return ret; if (file->inpoint != AV_NOPTS_VALUE) { _______________________________________________ ffmpeg-cvslog mailing list ffmpeg-cvslog@ffmpeg.org http://ffmpeg.org/mailman/listinfo/ffmpeg-cvslog
