avfilter/[vf_nnedi, vf_estdif]: check interlaced flag on correct frame

Fixes regression in vf_nnedi after 24dc6d386c6f7edb8f6945319f53a7f0b1642bb8 and vf_estdif while at it.

Kacper Michajłow committed 5 years ago

Commit b7e350a1 parent 03a8d9c2 files · +2 −2Browse files

Unified · Split

2 files

libavfilter/vf_estdif.c +1 −1
libavfilter/vf_nnedi.c +1 −1

libavfilter/vf_estdif.c+1−1

@@ -498,7 +498,7 @@ static int config_input(AVFilterLink *inlink) · 497 unmodified lines
498	498	return 0;
499	499	}
500	500
501		− if ((s->deint && !in->interlaced_frame) \|\| ctx->is_disabled) {
	501	+ if ((s->deint && !s->prev->interlaced_frame) \|\| ctx->is_disabled) {
502	502	s->prev->pts *= 2;
503	503	ret = ff_filter_frame(ctx->outputs[0], s->prev);
504	504	s->prev = in;

libavfilter/vf_nnedi.c+1−1

@@ -694,7 +694,7 @@ static int filter_frame(AVFilterLink inlink, AVFrame in) · 693 unmodified lines
694	694	return 0;
695	695	}
696	696
697		− if ((s->deint && !in->interlaced_frame) \|\| ctx->is_disabled) {
	697	+ if ((s->deint && !s->prev->interlaced_frame) \|\| ctx->is_disabled) {
698	698	s->prev->pts *= 2;
699	699	ret = ff_filter_frame(ctx->outputs[0], s->prev);
700	700	s->prev = in;