concatdec: fix broken file_inpoint calculation
authorMarton Balint <cus@passwd.hu>
Sat, 8 Aug 2015 11:56:42 +0000 (13:56 +0200)
committerMarton Balint <cus@passwd.hu>
Tue, 11 Aug 2015 09:19:17 +0000 (11:19 +0200)
Should fix ticket #4765.

Signed-off-by: Marton Balint <cus@passwd.hu>
libavformat/concatdec.c

index 1fe294b..969b001 100644 (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) {