Chiebot-Mirror
/
FFmpeg
mirror of https://github.com/FFmpeg/FFmpeg.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

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

Browse Source 
Fixes regression in vf_nnedi after
24dc6d386c and vf_estdif while at it.

Signed-off-by: Kacper Michajłow <kasper93@gmail.com>
pull/359/head
Kacper Michajłow 4 years ago committed by Paul B Mahol
parent 03a8d9c7fd
commit b7e350af3e
2 changed files with 2 additions and 2 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      libavfilter/vf_estdif.c
  2. 2
      libavfilter/vf_nnedi.c

2
libavfilter/vf_estdif.c
Unescape View File

@ -498,7 +498,7 @@ static int config_input(AVFilterLink *inlink)
return 0; return 0;
} }
if ((s->deint && !in->interlaced_frame) || ctx->is_disabled) { if ((s->deint && !s->prev->interlaced_frame) || ctx->is_disabled) {
s->prev->pts *= 2; s->prev->pts *= 2;
ret = ff_filter_frame(ctx->outputs[0], s->prev); ret = ff_filter_frame(ctx->outputs[0], s->prev);
s->prev = in; s->prev = in;

2
libavfilter/vf_nnedi.c
Unescape View File

@ -694,7 +694,7 @@ static int filter_frame(AVFilterLink *inlink, AVFrame *in)
return 0; return 0;
} }
if ((s->deint && !in->interlaced_frame) || ctx->is_disabled) { if ((s->deint && !s->prev->interlaced_frame) || ctx->is_disabled) {
s->prev->pts *= 2; s->prev->pts *= 2;
ret = ff_filter_frame(ctx->outputs[0], s->prev); ret = ff_filter_frame(ctx->outputs[0], s->prev);
s->prev = in; s->prev = in;

Write Preview
Loading…
Cancel
Save