diff options
author | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-19 18:17:18 +0200 |
---|---|---|
committer | Michael Niedermayer <michael@niedermayer.cc> | 2015-07-19 18:17:45 +0200 |
commit | ea8785cedae21b312e18a0bc9cb5ebcd3462cc6b (patch) | |
tree | 22090d4f540138a981739a147bc8e5a1cbf78bff | |
parent | 9c943e077bfc23ba8d2e76a17fef7acbab4dd706 (diff) | |
download | ffmpeg-ea8785cedae21b312e18a0bc9cb5ebcd3462cc6b.tar.gz |
avcodec/utils: Check that channel count is valid in avcodec_open2();
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
-rw-r--r-- | libavcodec/utils.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index e4eb772f4c..53b01b09ba 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -1617,6 +1617,12 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, const AVCodec *code } else if (avctx->channel_layout) { avctx->channels = av_get_channel_layout_nb_channels(avctx->channel_layout); } + if (avctx->channels < 0) { + av_log(avctx, AV_LOG_ERROR, "Specified number of channels %d is not supported\n", + avctx->channels); + ret = AVERROR(EINVAL); + goto free_and_end; + } if(avctx->codec_type == AVMEDIA_TYPE_VIDEO) { if (avctx->width <= 0 || avctx->height <= 0) { av_log(avctx, AV_LOG_ERROR, "dimensions not set\n"); |