[FFmpeg-cvslog] concatdec: fix broken file_inpoint calculation

Marton Balint git at videolan.org
Tue Aug 11 11:31:59 CEST 2015


ffmpeg | branch: master | Marton Balint <cus at passwd.hu> | Sat Aug  8 13:56:42 2015 +0200| [086001652982db6c22bcff30e122ebe8229a1d85] | committer: Marton Balint

concatdec: fix broken file_inpoint calculation

Should fix ticket #4765.

Signed-off-by: Marton Balint <cus at passwd.hu>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=086001652982db6c22bcff30e122ebe8229a1d85
---

 libavformat/concatdec.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavformat/concatdec.c b/libavformat/concatdec.c
index 1fe294b..969b001 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) {



More information about the ffmpeg-cvslog mailing list