X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=libavfilter%2Fvf_fieldmatch.c;h=54a2c7aa60a218e249d16f0895c66a740f2cd16a;hb=07dcef9bc7a614084f4afe39de678884a36cabf1;hp=e155712caa0c2bdea669aa57cf210f8928b683af;hpb=6fc74934de1fcd82ace75dfff17605ec41c7e90d;p=ffmpeg diff --git a/libavfilter/vf_fieldmatch.c b/libavfilter/vf_fieldmatch.c index e155712caa0..54a2c7aa60a 100644 --- a/libavfilter/vf_fieldmatch.c +++ b/libavfilter/vf_fieldmatch.c @@ -740,7 +740,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) /* scene change check */ if (fm->combmatch == COMBMATCH_SC) { - if (fm->lastn == outlink->frame_count - 1) { + if (fm->lastn == outlink->frame_count_in - 1) { if (fm->lastscdiff > fm->scthresh) sc = 1; } else if (luma_abs_diff(fm->prv, fm->src) > fm->scthresh) { @@ -748,7 +748,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) } if (!sc) { - fm->lastn = outlink->frame_count; + fm->lastn = outlink->frame_count_in; fm->lastscdiff = luma_abs_diff(fm->src, fm->nxt); sc = fm->lastscdiff > fm->scthresh; } @@ -807,7 +807,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in) dst->interlaced_frame = combs[match] >= fm->combpel; if (dst->interlaced_frame) { av_log(ctx, AV_LOG_WARNING, "Frame #%"PRId64" at %s is still interlaced\n", - outlink->frame_count, av_ts2timestr(in->pts, &inlink->time_base)); + outlink->frame_count_in, av_ts2timestr(in->pts, &inlink->time_base)); dst->top_field_first = field; }