diff options
| author | Paul B Mahol <onemda@gmail.com> | 2016-02-09 18:32:54 +0100 |
|---|---|---|
| committer | Paul B Mahol <onemda@gmail.com> | 2016-02-10 19:57:23 +0100 |
| commit | 5486d7fa91f7233e6d9aa9ba8de7fe9287402637 (patch) | |
| tree | a59829d88c3075cc82f7f5a6527b39370cb6ec77 /libavfilter | |
| parent | a73b23e3df15125f0c6fa944a17a39892c836353 (diff) | |
| download | android_external_ffmpeg-5486d7fa91f7233e6d9aa9ba8de7fe9287402637.tar.gz android_external_ffmpeg-5486d7fa91f7233e6d9aa9ba8de7fe9287402637.tar.bz2 android_external_ffmpeg-5486d7fa91f7233e6d9aa9ba8de7fe9287402637.zip | |
avfilter/dualinput: use pts provided by framesync
This fixes stalled output pts when main stream ends.
Signed-off-by: Paul B Mahol <onemda@gmail.com>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/dualinput.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/libavfilter/dualinput.c b/libavfilter/dualinput.c index ea2007f93c..1a078a25e4 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); |