diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-10-20 21:59:24 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-10-20 22:02:45 +0200 |
| commit | 2e0ac145d56fa37ae9f3624c702d9b88dcfb3298 (patch) | |
| tree | 132019797d84094f12e4616b2e12207e0ebcbbbc /libavfilter | |
| parent | e493814d6191c6dd2900296df546b5f5c7e4452d (diff) | |
| parent | d1afd3e1d6e43f4d37ae147091f270124ac48e04 (diff) | |
| download | ffmpeg-2e0ac145d56fa37ae9f3624c702d9b88dcfb3298.tar.gz | |
Merge commit 'd1afd3e1d6e43f4d37ae147091f270124ac48e04'
* commit 'd1afd3e1d6e43f4d37ae147091f270124ac48e04':
vf_format: check input validity
See: ee16e0cacc16ea60c35a66796410012755263c3c
Merged-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavfilter')
| -rw-r--r-- | libavfilter/vf_format.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/libavfilter/vf_format.c b/libavfilter/vf_format.c index 13b41e4663..96cb7fd077 100644 --- a/libavfilter/vf_format.c +++ b/libavfilter/vf_format.c @@ -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; |