Merge commit '7f83959598b6565baa0091e5739dd9091ab7a990'

* commit '7f83959598b6565baa0091e5739dd9091ab7a990':
  vf_crop: use the name 's' for the pointer to the private context
  vf_boxblur: use the name 's' for the pointer to the private context
  vf_blackframe: use the name 's' for the pointer to the private context

Conflicts:
	libavfilter/vf_blackframe.c
	libavfilter/vf_boxblur.c
	libavfilter/vf_crop.c

Merged-by: Michael Niedermayer <michaelni@gmx.at>

diff --cc libavfilter/vf_blackframe.c
index 7b38fcb,1b1e796..b83e1f8
--- 1/libavfilter/vf_blackframe.c
--- 2/libavfilter/vf_blackframe.c
+++ b/libavfilter/vf_blackframe.c
@@@ -73,19 -72,14 +73,19 @@@ static int filter_frame(AVFilterLink *i
          p += frame->linesize[0];
      }
  
-         blackframe->last_keyframe = blackframe->frame;
 +    if (frame->key_frame)
-     pblack = blackframe->nblack * 100 / (inlink->w * inlink->h);
-     if (pblack >= blackframe->bamount)
++        s->last_keyframe = s->frame;
 +
 -        av_log(ctx, AV_LOG_INFO, "frame:%u pblack:%u pts:%"PRId64" t:%f\n",
+     pblack = s->nblack * 100 / (inlink->w * inlink->h);
+     if (pblack >= s->bamount)
-                blackframe->frame, pblack, frame->pts,
 +        av_log(ctx, AV_LOG_INFO, "frame:%u pblack:%u pts:%"PRId64" t:%f "
 +               "type:%c last_keyframe:%d\n",
 -               frame->pts == AV_NOPTS_VALUE ? -1 : frame->pts * av_q2d(inlink->time_base));
+                s->frame, pblack, frame->pts,
-                av_get_picture_type_char(frame->pict_type), blackframe->last_keyframe);
 +               frame->pts == AV_NOPTS_VALUE ? -1 : frame->pts * av_q2d(inlink->time_base),
++               av_get_picture_type_char(frame->pict_type), s->last_keyframe);
  
-     blackframe->frame++;
-     blackframe->nblack = 0;
+     s->frame++;
+     s->nblack = 0;
      return ff_filter_frame(inlink->dst->outputs[0], frame);
  }
  

diff --cc libavfilter/vf_boxblur.c
index c085597,44c148b..8a59890
--- 1/libavfilter/vf_boxblur.c
--- 2/libavfilter/vf_boxblur.c
+++ b/libavfilter/vf_boxblur.c
@@@ -80,29 -82,25 +80,29 @@@ typedef struct 
  
  static av_cold int init(AVFilterContext *ctx)
  {
-     BoxBlurContext *boxblur = ctx->priv;
+     BoxBlurContext *s = ctx->priv;
  
-     if (!boxblur->luma_param.radius_expr) {
 -    if (!s->luma_radius_expr) {
++    if (!s->luma_param.radius_expr) {
          av_log(ctx, AV_LOG_ERROR, "Luma radius expression is not set.\n");
          return AVERROR(EINVAL);
      }
  
 -    if (!s->chroma_radius_expr) {
 -        s->chroma_radius_expr = av_strdup(s->luma_radius_expr);
 -        if (!s->chroma_radius_expr)
 +    /* fill missing params */
-     if (!boxblur->chroma_param.radius_expr) {
-         boxblur->chroma_param.radius_expr = av_strdup(boxblur->luma_param.radius_expr);
-         if (!boxblur->chroma_param.radius_expr)
++    if (!s->chroma_param.radius_expr) {
++        s->chroma_param.radius_expr = av_strdup(s->luma_param.radius_expr);
++        if (!s->chroma_param.radius_expr)
              return AVERROR(ENOMEM);
 -        s->chroma_param.power = s->luma_param.power;
      }
-     if (boxblur->chroma_param.power < 0)
-         boxblur->chroma_param.power = boxblur->luma_param.power;
 -    if (!s->alpha_radius_expr) {
 -        s->alpha_radius_expr = av_strdup(s->luma_radius_expr);
 -        if (!s->alpha_radius_expr)
++    if (s->chroma_param.power < 0)
++        s->chroma_param.power = s->luma_param.power;
 +
-     if (!boxblur->alpha_param.radius_expr) {
-         boxblur->alpha_param.radius_expr = av_strdup(boxblur->luma_param.radius_expr);
-         if (!boxblur->alpha_param.radius_expr)
++    if (!s->alpha_param.radius_expr) {
++        s->alpha_param.radius_expr = av_strdup(s->luma_param.radius_expr);
++        if (!s->alpha_param.radius_expr)
              return AVERROR(ENOMEM);
 -        s->alpha_param.power = s->luma_param.power;
      }
-     if (boxblur->alpha_param.power < 0)
-         boxblur->alpha_param.power = boxblur->luma_param.power;
++    if (s->alpha_param.power < 0)
++        s->alpha_param.power = s->luma_param.power;
  
      return 0;
  }
@@@ -141,25 -139,30 +141,25 @@@ static int config_input(AVFilterLink *i
      char *expr;
      int ret;
  
-     if (!(boxblur->temp[0] = av_malloc(FFMAX(w, h))) ||
-         !(boxblur->temp[1] = av_malloc(FFMAX(w, h))))
 -    av_freep(&s->temp[0]);
 -    av_freep(&s->temp[1]);
 -    if (!(s->temp[0] = av_malloc(FFMAX(w, h))))
 -       return AVERROR(ENOMEM);
 -    if (!(s->temp[1] = av_malloc(FFMAX(w, h)))) {
 -        av_freep(&s->temp[0]);
++    if (!(s->temp[0] = av_malloc(FFMAX(w, h))) ||
++        !(s->temp[1] = av_malloc(FFMAX(w, h))))
          return AVERROR(ENOMEM);
 -    }
  
-     boxblur->hsub = desc->log2_chroma_w;
-     boxblur->vsub = desc->log2_chroma_h;
+     s->hsub = desc->log2_chroma_w;
+     s->vsub = desc->log2_chroma_h;
  
      var_values[VAR_W]       = inlink->w;
      var_values[VAR_H]       = inlink->h;
-     var_values[VAR_CW] = cw = w>>boxblur->hsub;
-     var_values[VAR_CH] = ch = h>>boxblur->vsub;
-     var_values[VAR_HSUB]    = 1<<boxblur->hsub;
-     var_values[VAR_VSUB]    = 1<<boxblur->vsub;
+     var_values[VAR_CW] = cw = w>>s->hsub;
+     var_values[VAR_CH] = ch = h>>s->vsub;
+     var_values[VAR_HSUB]    = 1<<s->hsub;
+     var_values[VAR_VSUB]    = 1<<s->vsub;
  
  #define EVAL_RADIUS_EXPR(comp)                                          \
-     expr = boxblur->comp##_param.radius_expr;                           \
 -    expr = s->comp##_radius_expr;                                       \
++    expr = s->comp##_param.radius_expr;                                 \
      ret = av_expr_parse_and_eval(&res, expr, var_names, var_values,     \
                                   NULL, NULL, NULL, NULL, NULL, 0, ctx); \
-     boxblur->comp##_param.radius = res;                                 \
+     s->comp##_param.radius = res;                                       \
      if (ret < 0) {                                                      \
          av_log(NULL, AV_LOG_ERROR,                                      \
                 "Error when evaluating " #comp " radius expression '%s'\n", expr); \
@@@ -302,7 -305,7 +302,7 @@@ static int filter_frame(AVFilterLink *i
      AVFilterLink *outlink = inlink->dst->outputs[0];
      AVFrame *out;
      int plane;
-     int cw = FF_CEIL_RSHIFT(inlink->w, boxblur->hsub), ch = FF_CEIL_RSHIFT(in->height, boxblur->vsub);
 -    int cw = inlink->w >> s->hsub, ch = in->height >> s->vsub;
++    int cw = FF_CEIL_RSHIFT(inlink->w, s->hsub), ch = FF_CEIL_RSHIFT(in->height, s->vsub);
      int w[4] = { inlink->w, cw, cw, inlink->w };
      int h[4] = { in->height, ch, ch, in->height };
  

diff --cc libavfilter/vf_crop.c
index 3b20ee5,d94f620..829d0bb
--- 1/libavfilter/vf_crop.c
--- 2/libavfilter/vf_crop.c
+++ b/libavfilter/vf_crop.c
@@@ -155,72 -149,60 +157,72 @@@ static int config_input(AVFilterLink *l
      const char *expr;
      double res;
  
-     crop->var_values[VAR_IN_W]  = crop->var_values[VAR_IW] = ctx->inputs[0]->w;
-     crop->var_values[VAR_IN_H]  = crop->var_values[VAR_IH] = ctx->inputs[0]->h;
-     crop->var_values[VAR_A]     = (float) link->w / link->h;
-     crop->var_values[VAR_SAR]   = link->sample_aspect_ratio.num ? av_q2d(link->sample_aspect_ratio) : 1;
-     crop->var_values[VAR_DAR]   = crop->var_values[VAR_A] * crop->var_values[VAR_SAR];
-     crop->var_values[VAR_HSUB]  = 1<<pix_desc->log2_chroma_w;
-     crop->var_values[VAR_VSUB]  = 1<<pix_desc->log2_chroma_h;
-     crop->var_values[VAR_X]     = NAN;
-     crop->var_values[VAR_Y]     = NAN;
-     crop->var_values[VAR_OUT_W] = crop->var_values[VAR_OW] = NAN;
-     crop->var_values[VAR_OUT_H] = crop->var_values[VAR_OH] = NAN;
-     crop->var_values[VAR_N]     = 0;
-     crop->var_values[VAR_T]     = NAN;
-     crop->var_values[VAR_POS]   = NAN;
- 
-     av_image_fill_max_pixsteps(crop->max_step, NULL, pix_desc);
-     crop->hsub = pix_desc->log2_chroma_w;
-     crop->vsub = pix_desc->log2_chroma_h;
- 
-     if ((ret = av_expr_parse_and_eval(&res, (expr = crop->w_expr),
-                                       var_names, crop->var_values,
 -    s->var_values[VAR_E]     = M_E;
 -    s->var_values[VAR_PHI]   = M_PHI;
 -    s->var_values[VAR_PI]    = M_PI;
+     s->var_values[VAR_IN_W]  = s->var_values[VAR_IW] = ctx->inputs[0]->w;
+     s->var_values[VAR_IN_H]  = s->var_values[VAR_IH] = ctx->inputs[0]->h;
++    s->var_values[VAR_A]     = (float) link->w / link->h;
++    s->var_values[VAR_SAR]   = link->sample_aspect_ratio.num ? av_q2d(link->sample_aspect_ratio) : 1;
++    s->var_values[VAR_DAR]   = s->var_values[VAR_A] * s->var_values[VAR_SAR];
++    s->var_values[VAR_HSUB]  = 1<<pix_desc->log2_chroma_w;
++    s->var_values[VAR_VSUB]  = 1<<pix_desc->log2_chroma_h;
+     s->var_values[VAR_X]     = NAN;
+     s->var_values[VAR_Y]     = NAN;
+     s->var_values[VAR_OUT_W] = s->var_values[VAR_OW] = NAN;
+     s->var_values[VAR_OUT_H] = s->var_values[VAR_OH] = NAN;
+     s->var_values[VAR_N]     = 0;
+     s->var_values[VAR_T]     = NAN;
++    s->var_values[VAR_POS]   = NAN;
+ 
+     av_image_fill_max_pixsteps(s->max_step, NULL, pix_desc);
+     s->hsub = pix_desc->log2_chroma_w;
+     s->vsub = pix_desc->log2_chroma_h;
+ 
 -    if ((ret = av_expr_parse_and_eval(&res, (expr = s->ow_expr),
++    if ((ret = av_expr_parse_and_eval(&res, (expr = s->w_expr),
+                                       var_names, s->var_values,
                                        NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0) goto fail_expr;
-     crop->var_values[VAR_OUT_W] = crop->var_values[VAR_OW] = res;
-     if ((ret = av_expr_parse_and_eval(&res, (expr = crop->h_expr),
-                                       var_names, crop->var_values,
+     s->var_values[VAR_OUT_W] = s->var_values[VAR_OW] = res;
 -    if ((ret = av_expr_parse_and_eval(&res, (expr = s->oh_expr),
++    if ((ret = av_expr_parse_and_eval(&res, (expr = s->h_expr),
+                                       var_names, s->var_values,
                                        NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0) goto fail_expr;
-     crop->var_values[VAR_OUT_H] = crop->var_values[VAR_OH] = res;
+     s->var_values[VAR_OUT_H] = s->var_values[VAR_OH] = res;
      /* evaluate again ow as it may depend on oh */
-     if ((ret = av_expr_parse_and_eval(&res, (expr = crop->w_expr),
-                                       var_names, crop->var_values,
 -    if ((ret = av_expr_parse_and_eval(&res, (expr = s->ow_expr),
++    if ((ret = av_expr_parse_and_eval(&res, (expr = s->w_expr),
+                                       var_names, s->var_values,
                                        NULL, NULL, NULL, NULL, NULL, 0, ctx)) < 0) goto fail_expr;
-     crop->var_values[VAR_OUT_W] = crop->var_values[VAR_OW] = res;
-     if (normalize_double(&crop->w, crop->var_values[VAR_OUT_W]) < 0 ||
-         normalize_double(&crop->h, crop->var_values[VAR_OUT_H]) < 0) {
+     s->var_values[VAR_OUT_W] = s->var_values[VAR_OW] = res;
+     if (normalize_double(&s->w, s->var_values[VAR_OUT_W]) < 0 ||
+         normalize_double(&s->h, s->var_values[VAR_OUT_H]) < 0) {
          av_log(ctx, AV_LOG_ERROR,
                 "Too big value or invalid expression for out_w/ow or out_h/oh. "
                 "Maybe the expression for out_w:'%s' or for out_h:'%s' is self-referencing.\n",
-                crop->w_expr, crop->h_expr);
 -               s->ow_expr, s->oh_expr);
++               s->w_expr, s->h_expr);
          return AVERROR(EINVAL);
      }
-     crop->w &= ~((1 << crop->hsub) - 1);
-     crop->h &= ~((1 << crop->vsub) - 1);
+     s->w &= ~((1 << s->hsub) - 1);
+     s->h &= ~((1 << s->vsub) - 1);
  
-     if ((ret = av_expr_parse(&crop->x_pexpr, crop->x_expr, var_names,
+     if ((ret = av_expr_parse(&s->x_pexpr, s->x_expr, var_names,
                               NULL, NULL, NULL, NULL, 0, ctx)) < 0 ||
-         (ret = av_expr_parse(&crop->y_pexpr, crop->y_expr, var_names,
+         (ret = av_expr_parse(&s->y_pexpr, s->y_expr, var_names,
                               NULL, NULL, NULL, NULL, 0, ctx)) < 0)
          return AVERROR(EINVAL);
  
-     if (crop->keep_aspect) {
 -    av_log(ctx, AV_LOG_VERBOSE, "w:%d h:%d -> w:%d h:%d\n",
 -           link->w, link->h, s->w, s->h);
++    if (s->keep_aspect) {
 +        AVRational dar = av_mul_q(link->sample_aspect_ratio,
 +                                  (AVRational){ link->w, link->h });
-         av_reduce(&crop->out_sar.num, &crop->out_sar.den,
-                   dar.num * crop->h, dar.den * crop->w, INT_MAX);
++        av_reduce(&s->out_sar.num, &s->out_sar.den,
++                  dar.num * s->h, dar.den * s->w, INT_MAX);
 +    } else
-         crop->out_sar = link->sample_aspect_ratio;
++        s->out_sar = link->sample_aspect_ratio;
 +
 +    av_log(ctx, AV_LOG_VERBOSE, "w:%d h:%d sar:%d/%d -> w:%d h:%d sar:%d/%d\n",
 +           link->w, link->h, link->sample_aspect_ratio.num, link->sample_aspect_ratio.den,
-            crop->w, crop->h, crop->out_sar.num, crop->out_sar.den);
++           s->w, s->h, s->out_sar.num, s->out_sar.den);
  
-     if (crop->w <= 0 || crop->h <= 0 ||
-         crop->w > link->w || crop->h > link->h) {
+     if (s->w <= 0 || s->h <= 0 ||
+         s->w > link->w || s->h > link->h) {
          av_log(ctx, AV_LOG_ERROR,
                 "Invalid too big or non positive size for width '%d' or height '%d'\n",
-                crop->w, crop->h);
+                s->w, s->h);
          return AVERROR(EINVAL);
      }
  
@@@ -238,11 -220,10 +240,11 @@@ fail_expr
  
  static int config_output(AVFilterLink *link)
  {
-     CropContext *crop = link->src->priv;
+     CropContext *s = link->src->priv;
  
-     link->w = crop->w;
-     link->h = crop->h;
-     link->sample_aspect_ratio = crop->out_sar;
+     link->w = s->w;
+     link->h = s->h;
++    link->sample_aspect_ratio = s->out_sar;
  
      return 0;
  }
@@@ -254,34 -235,35 +256,38 @@@ static int filter_frame(AVFilterLink *l
      const AVPixFmtDescriptor *desc = av_pix_fmt_desc_get(link->format);
      int i;
  
-     frame->width  = crop->w;
-     frame->height = crop->h;
+     frame->width  = s->w;
+     frame->height = s->h;
  
-     crop->var_values[VAR_N] = link->frame_count;
-     crop->var_values[VAR_T] = frame->pts == AV_NOPTS_VALUE ?
++    s->var_values[VAR_N] = link->frame_count;
+     s->var_values[VAR_T] = frame->pts == AV_NOPTS_VALUE ?
          NAN : frame->pts * av_q2d(link->time_base);
-     crop->var_values[VAR_POS] = av_frame_get_pkt_pos(frame) == -1 ?
++    s->var_values[VAR_POS] = av_frame_get_pkt_pos(frame) == -1 ?
 +        NAN : av_frame_get_pkt_pos(frame);
-     crop->var_values[VAR_X] = av_expr_eval(crop->x_pexpr, crop->var_values, NULL);
-     crop->var_values[VAR_Y] = av_expr_eval(crop->y_pexpr, crop->var_values, NULL);
-     crop->var_values[VAR_X] = av_expr_eval(crop->x_pexpr, crop->var_values, NULL);
- 
-     normalize_double(&crop->x, crop->var_values[VAR_X]);
-     normalize_double(&crop->y, crop->var_values[VAR_Y]);
- 
-     if (crop->x < 0) crop->x = 0;
-     if (crop->y < 0) crop->y = 0;
-     if ((unsigned)crop->x + (unsigned)crop->w > link->w) crop->x = link->w - crop->w;
-     if ((unsigned)crop->y + (unsigned)crop->h > link->h) crop->y = link->h - crop->h;
-     crop->x &= ~((1 << crop->hsub) - 1);
-     crop->y &= ~((1 << crop->vsub) - 1);
+     s->var_values[VAR_X] = av_expr_eval(s->x_pexpr, s->var_values, NULL);
+     s->var_values[VAR_Y] = av_expr_eval(s->y_pexpr, s->var_values, NULL);
+     s->var_values[VAR_X] = av_expr_eval(s->x_pexpr, s->var_values, NULL);
+ 
+     normalize_double(&s->x, s->var_values[VAR_X]);
+     normalize_double(&s->y, s->var_values[VAR_Y]);
+ 
+     if (s->x < 0)
+         s->x = 0;
+     if (s->y < 0)
+         s->y = 0;
+     if ((unsigned)s->x + (unsigned)s->w > link->w)
+         s->x = link->w - s->w;
+     if ((unsigned)s->y + (unsigned)s->h > link->h)
+         s->y = link->h - s->h;
+     s->x &= ~((1 << s->hsub) - 1);
+     s->y &= ~((1 << s->vsub) - 1);
  
 -    av_dlog(ctx, "n:%d t:%f x:%d y:%d x+w:%d y+h:%d\n",
 -            (int)s->var_values[VAR_N], s->var_values[VAR_T], s->x,
 -            s->y, s->x+s->w, s->y+s->h);
 +    av_dlog(ctx, "n:%d t:%f pos:%f x:%d y:%d x+w:%d y+h:%d\n",
-             (int)crop->var_values[VAR_N], crop->var_values[VAR_T], crop->var_values[VAR_POS],
-             crop->x, crop->y, crop->x+crop->w, crop->y+crop->h);
++            (int)s->var_values[VAR_N], s->var_values[VAR_T], s->var_values[VAR_POS],
++            s->x, s->y, s->x+s->w, s->y+s->h);
  
-     frame->data[0] += crop->y * frame->linesize[0];
-     frame->data[0] += crop->x * crop->max_step[0];
+     frame->data[0] += s->y * frame->linesize[0];
+     frame->data[0] += s->x * s->max_step[0];
  
      if (!(desc->flags & AV_PIX_FMT_FLAG_PAL || desc->flags & AV_PIX_FMT_FLAG_PSEUDOPAL)) {
          for (i = 1; i < 3; i ++) {
@@@ -294,10 -276,12 +300,10 @@@
  
      /* alpha plane */
      if (frame->data[3]) {
-         frame->data[3] += crop->y * frame->linesize[3];
-         frame->data[3] += crop->x * crop->max_step[3];
+         frame->data[3] += s->y * frame->linesize[3];
+         frame->data[3] += s->x * s->max_step[3];
      }
  
 -    s->var_values[VAR_N] += 1.0;
 -
      return ff_filter_frame(link->dst->outputs[0], frame);
  }