[FFmpeg-devel] [PATCH V1] lavfi/concat: fix logic error in framerate check

mypopy at gmail.com mypopy at gmail.com
Mon Sep 9 11:00:35 EEST 2019


On Mon, Sep 9, 2019 at 3:21 PM Paul B Mahol <onemda at gmail.com> wrote:
>
> lgtm
>
Will apply, Thanks

> On 9/9/19, Jun Zhao <mypopydev at gmail.com> wrote:
> > From: Jun Zhao <barryjzhao at tencent.com>
> >
> > fix logic error in framerate check, it's introduced by commit
> > 3ad5d4df9ce794d3eeb0f526c5f3e446bf97c616
> >
> > Signed-off-by: Jun Zhao <barryjzhao at 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


More information about the ffmpeg-devel mailing list