diff options
| author | Reimar Döffinger <Reimar.Doeffinger@gmx.de> | 2011-02-09 10:52:33 -0500 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2011-02-09 15:30:53 -0500 |
| commit | 2cfa2d925808e6cc6fb7a7c133b7cb7622afd37e (patch) | |
| tree | 1d57ab59a0bcb228aec02414382a9da6704b4aab /libavcodec/utils.c | |
| parent | f4c79d1e0b2e797012304db57903e4091b0c2d7c (diff) | |
check sample_fmt in avcodec_open
check AVCodecContext->sample_fmt against AVCodec->sample_fmts[] to ensure
that the encoder supports the specified sample format. Error out if it doesn't.
Previously, it would continue and output garbage. Fixes issue 2587.
Diffstat (limited to 'libavcodec/utils.c')
| -rw-r--r-- | libavcodec/utils.c | 10 |
1 files changed, 10 insertions, 0 deletions
diff --git a/libavcodec/utils.c b/libavcodec/utils.c index eede431e32..0816b39cda 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -551,6 +551,16 @@ int attribute_align_arg avcodec_open(AVCodecContext *avctx, AVCodec *codec) avctx->codec->max_lowres); goto free_and_end; } + if (avctx->codec->sample_fmts && avctx->codec->encode) { + int i; + for (i = 0; avctx->codec->sample_fmts[i] != AV_SAMPLE_FMT_NONE; i++) + if (avctx->sample_fmt == avctx->codec->sample_fmts[i]) + break; + if (avctx->codec->sample_fmts[i] == AV_SAMPLE_FMT_NONE) { + av_log(avctx, AV_LOG_ERROR, "Specified sample_fmt is not supported.\n"); + goto free_and_end; + } + } if(avctx->codec->init && !(avctx->active_thread_type&FF_THREAD_FRAME)){ ret = avctx->codec->init(avctx); |