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

Showing the changes to libavfilter (2 of 2 files). Show all

Unified · Split

2 files

@@ -498,7 +498,7 @@ static int config_input(AVFilterLink *inlink) · 497 unmodified lines
498	return 0;	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	s->prev->pts *= 2;	502	s->prev->pts *= 2;
503	ret = ff_filter_frame(ctx->outputs[0], s->prev);	503	ret = ff_filter_frame(ctx->outputs[0], s->prev);
504	s->prev = in;	504	s->prev = in;

@@ -694,7 +694,7 @@ static int filter_frame(AVFilterLink inlink, AVFrame in) · 693 unmodified lines
694	return 0;	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	s->prev->pts *= 2;	698	s->prev->pts *= 2;
699	ret = ff_filter_frame(ctx->outputs[0], s->prev);	699	ret = ff_filter_frame(ctx->outputs[0], s->prev);
700	s->prev = in;	700	s->prev = in;

Keyboard shortcuts