From 527c91e34a0e1b49dbaede9fa1a7cc81ef8a3b0a Mon Sep 17 00:00:00 2001 From: Carl Eugen Hoyos Date: Mon, 13 Sep 2010 22:03:29 +0000 Subject: [PATCH] Test lowres before codec init. Originally committed as revision 25114 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/utils.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/libavcodec/utils.c b/libavcodec/utils.c index 442b9efe27..e12b677a93 100644 --- a/libavcodec/utils.c +++ b/libavcodec/utils.c @@ -504,13 +504,13 @@ int attribute_align_arg avcodec_open(AVCodecContext *avctx, AVCodec *codec) goto free_and_end; } avctx->frame_number = 0; - if(avctx->codec->init){ - if (avctx->codec->max_lowres < avctx->lowres) { - av_log(avctx, AV_LOG_ERROR, "The maximum value for lowres supported by the decoder is %d\n", - avctx->codec->max_lowres); - goto free_and_end; - } + if (avctx->codec->max_lowres < avctx->lowres) { + av_log(avctx, AV_LOG_ERROR, "The maximum value for lowres supported by the decoder is %d\n", + avctx->codec->max_lowres); + goto free_and_end; + } + if(avctx->codec->init){ ret = avctx->codec->init(avctx); if (ret < 0) { goto free_and_end;