Module: ffmpeg Branch: master Commit: 2cfa2d925808e6cc6fb7a7c133b7cb7622afd37e
Author: Reimar Döffinger <[email protected]> Date: Wed Feb 9 10:52:33 2011 -0500 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. --- libavcodec/utils.c | 10 ++++++++++ 1 files changed, 10 insertions(+), 0 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index eede431..0816b39 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); _______________________________________________ ffmpeg-commits mailing list [email protected] https://lists.mplayerhq.hu/mailman/listinfo/ffmpeg-commits
