Merge commit 'd1ad85fc020653be5ad25ed1d3d5091e89fee782' into release/2.4
authorMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 00:03:06 +0000 (01:03 +0100)
committerMichael Niedermayer <michaelni@gmx.at>
Sun, 18 Jan 2015 00:03:19 +0000 (01:03 +0100)
* commit 'd1ad85fc020653be5ad25ed1d3d5091e89fee782':
  vf_format: check input validity

See: ee16e0cacc16ea60c35a66796410012755263c3c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
1  2 
libavfilter/vf_format.c

@@@ -58,10 -58,11 +58,12 @@@ static av_cold int init(AVFilterContex
      char *cur, *sep;
      int nb_formats = 1;
      int i;
 +    int ret;
  
-     if (!s->pix_fmts)
+     if (!s->pix_fmts) {
+         av_log(ctx, AV_LOG_ERROR, "Empty output format string.\n");
          return AVERROR(EINVAL);
+     }
  
      /* count the formats */
      cur = s->pix_fmts;