| Message ID | 1567993770-11166-1-git-send-email-mypopydev@gmail.com |
|---|---|
| State | Accepted |
| Commit | a0abcb4a31c35e35f6e4afdc5b0fc2d902dc45f7 |
| Headers | show |
lgtm On 9/9/19, Jun Zhao <mypopydev@gmail.com> wrote: > From: Jun Zhao <barryjzhao@tencent.com> > > fix logic error in framerate check, it's introduced by commit > 3ad5d4df9ce794d3eeb0f526c5f3e446bf97c616 > > Signed-off-by: Jun Zhao <barryjzhao@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-request@ffmpeg.org with subject "unsubscribe".
On Mon, Sep 9, 2019 at 3:21 PM Paul B Mahol <onemda@gmail.com> wrote: > > lgtm > Will apply, Thanks > On 9/9/19, Jun Zhao <mypopydev@gmail.com> wrote: > > From: Jun Zhao <barryjzhao@tencent.com> > > > > fix logic error in framerate check, it's introduced by commit > > 3ad5d4df9ce794d3eeb0f526c5f3e446bf97c616 > > > > Signed-off-by: Jun Zhao <barryjzhao@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
Jun Zhao (12019-09-09): > From: Jun Zhao <barryjzhao@tencent.com> > > fix logic error in framerate check, it's introduced by commit > 3ad5d4df9ce794d3eeb0f526c5f3e446bf97c616 > > Signed-off-by: Jun Zhao <barryjzhao@tencent.com> > --- > libavfilter/avf_concat.c | 2 +- > 1 files changed, 1 insertions(+), 1 deletions(-) Of course, thanks. Sorry for missing it. Regards,
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);