[FFmpeg-cvslog] avfilter/dualinput: use pts provided by framesync

[Paul B Mahol]

ffmpeg | branch: master | Paul B Mahol <onemda at gmail.com> | Tue Feb  9 18:32:54 2016 +0100| [5486d7fa91f7233e6d9aa9ba8de7fe9287402637] | committer: Paul B Mahol

avfilter/dualinput: use pts provided by framesync

This fixes stalled output pts when main stream ends.

Signed-off-by: Paul B Mahol <onemda at gmail.com>

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

 libavfilter/dualinput.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libavfilter/dualinput.c b/libavfilter/dualinput.c
index ea2007f..1a078a2 100644
--- a/libavfilter/dualinput.c
+++ b/libavfilter/dualinput.c
@@ -32,7 +32,7 @@ static int process_frame(FFFrameSync *fs)
         return ret;
     }
     av_assert0(mainpic);
-    mainpic->pts = av_rescale_q(mainpic->pts, s->fs.time_base, ctx->outputs[0]->time_base);
+    mainpic->pts = av_rescale_q(s->fs.pts, s->fs.time_base, ctx->outputs[0]->time_base);
     if (secondpic && !ctx->is_disabled)
         mainpic = s->process(ctx, mainpic, secondpic);
     ret = ff_filter_frame(ctx->outputs[0], mainpic);