Merge commit 'd1ad85fc020653be5ad25ed1d3d5091e89fee782' into release/2.4

* commit 'd1ad85fc020653be5ad25ed1d3d5091e89fee782':
  vf_format: check input validity

See: ee16e0cacc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer
2015-01-18 01:03:06 +01:00

View File

@@ -60,8 +60,10 @@ static av_cold int init(AVFilterContext *ctx)
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;