lgtm On 9/9/19, Jun Zhao <mypopy...@gmail.com> wrote: > From: Jun Zhao <barryjz...@tencent.com> > > fix logic error in framerate check, it's introduced by commit > 3ad5d4df9ce794d3eeb0f526c5f3e446bf97c616 > > Signed-off-by: Jun Zhao <barryjz...@tencent.com> > --- > libavfilter/avf_concat.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) > > diff --git a/libavfilter/avf_concat.c b/libavfilter/avf_concat.c > index 2791859..28bd540 100644 > --- a/libavfilter/avf_concat.c > +++ b/libavfilter/avf_concat.c > @@ -136,7 +136,7 @@ static int config_output(AVFilterLink *outlink) > for (seg = 1; seg < cat->nb_segments; seg++) { > inlink = ctx->inputs[in_no + seg * ctx->nb_outputs]; > if (outlink->frame_rate.num != inlink->frame_rate.num || > - outlink->frame_rate.den != outlink->frame_rate.den) { > + outlink->frame_rate.den != inlink->frame_rate.den) { > av_log(ctx, AV_LOG_VERBOSE, > "Video inputs have different frame rates, output will > be VFR\n"); > outlink->frame_rate = av_make_q(1, 0); > -- > 1.7.1 > > _______________________________________________ > ffmpeg-devel mailing list > ffmpeg-devel@ffmpeg.org > https://ffmpeg.org/mailman/listinfo/ffmpeg-devel > > To unsubscribe, visit link above, or email > ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe". _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".