lavfi/vf_estdif: drop a redundant context variable

It is only used in filter() and always set immediately before filter() is called, so it can be passed as a parameter instead.

Anton Khirnov committed 4 years ago

Commit 62bfcc31 parent 2feeb6d1 file · +4 −7Browse files

Unified · Split

     int max;
     int nb_planes;
     int nb_threads;
-    int64_t pts;
     AVFrame *prev;
     void (*interpolate)(struct ESTDIFContext *s, uint8_t *dst,
     return 0;
 }
-static int filter(AVFilterContext *ctx, AVFrame *in)
+static int filter(AVFilterContext *ctx, AVFrame *in, int64_t pts)
 {
     ESTDIFContext *s = ctx->priv;
     AVFilterLink *outlink = ctx->outputs[0];
         return AVERROR(ENOMEM);
     av_frame_copy_props(out, in);
     out->interlaced_frame = 0;
-    out->pts = s->pts;
+    out->pts = pts;
     td.out = out; td.in = in;
     ff_filter_execute(ctx, deinterlace_slice, &td, NULL,
         return ret;
     }
-    s->pts = s->prev->pts * 2;
+    ret = filter(ctx, s->prev, s->prev->pts * 2);
-    ret = filter(ctx, s->prev);
     if (ret < 0 || s->mode == 0) {
         av_frame_free(&s->prev);
         s->prev = in;
         return ret;
     }
-    s->pts = s->prev->pts + in->pts;
+    ret = filter(ctx, s->prev, s->prev->pts + in->pts);
-    ret = filter(ctx, s->prev);
     av_frame_free(&s->prev);
     s->prev = in;
     return ret;

Keyboard shortcuts