Merge commit '9df477e03ef74068f3de130adc4dd34349a16ef2'
authorHendrik Leppkes <h.leppkes@gmail.com>
Wed, 11 Nov 2015 13:50:33 +0000 (14:50 +0100)
committerHendrik Leppkes <h.leppkes@gmail.com>
Wed, 11 Nov 2015 13:50:33 +0000 (14:50 +0100)
* commit '9df477e03ef74068f3de130adc4dd34349a16ef2':
  yadif: update frame rate

Merged-by: Hendrik Leppkes <h.leppkes@gmail.com>
1  2 
libavfilter/vf_yadif.c

@@@ -476,14 -462,10 +476,15 @@@ static int config_props(AVFilterLink *l
      link->w             = link->src->inputs[0]->w;
      link->h             = link->src->inputs[0]->h;
  
-     if(s->mode&1)
-         link->frame_rate = av_mul_q(link->src->inputs[0]->frame_rate, (AVRational){2,1});
 -    if (s->mode & 1)
++    if(s->mode & 1)
+         link->frame_rate = av_mul_q(link->src->inputs[0]->frame_rate,
+                                     (AVRational){2, 1});
  
 +    if (link->w < 3 || link->h < 3) {
 +        av_log(ctx, AV_LOG_ERROR, "Video of less than 3 columns or lines is not supported\n");
 +        return AVERROR(EINVAL);
 +    }
 +
      s->csp = av_pix_fmt_desc_get(link->format);
      if (s->csp->comp[0].depth > 8) {
          s->filter_line  = filter_line_c_16bit;