RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-04-01 22:49:21 +00:00
Code Issues Projects Releases Wiki Activity

avfilter/dualinput: use pts provided by framesync

Browse Source 
This fixes stalled output pts when main stream ends.

Signed-off-by: Paul B Mahol <onemda@gmail.com>
This commit is contained in:
Paul B Mahol 2016-02-09 18:32:54 +01:00
parent a73b23e3df
commit 5486d7fa91
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavfilter/dualinput.c
View File

@ -32,7 +32,7 @@ static int process_frame(FFFrameSync *fs)
return ret; return ret;
} }
av_assert0(mainpic); 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) if (secondpic && !ctx->is_disabled)
mainpic = s->process(ctx, mainpic, secondpic); mainpic = s->process(ctx, mainpic, secondpic);
ret = ff_filter_frame(ctx->outputs[0], mainpic); ret = ff_filter_frame(ctx->outputs[0], mainpic);