Merge commit 'd1afd3e1d6e43f4d37ae147091f270124ac48e04'

* commit 'd1afd3e1d6e43f4d37ae147091f270124ac48e04':
  vf_format: check input validity

See: ee16e0cacc
Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
Michael Niedermayer 2014-10-20 21:59:24 +02:00
commit 2e0ac145d5

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;