[FFmpeg-cvslog] Warn the user if lowres > max_lowres, set lowres to max_lowres and continue

[Jean First]

ffmpeg | branch: master | Jean First <jeanfirst at gmail.com> | Fri Sep 30 11:42:43 2011 +0200| [125ea3ee06c4d71082bee3fc03c65d7c8c10d68c] | committer: Michael Niedermayer

Warn the user if lowres > max_lowres, set lowres to max_lowres and continue

Signed-off-by: Michael Niedermayer <michaelni at gmx.at>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=125ea3ee06c4d71082bee3fc03c65d7c8c10d68c
---

 libavcodec/utils.c |    5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 95fb65a..0ac81ba 100644
--- a/libavcodec/utils.c
+++ b/libavcodec/utils.c
@@ -601,10 +601,9 @@ int attribute_align_arg avcodec_open2(AVCodecContext *avctx, AVCodec *codec, AVD
     }
 
     if (avctx->codec->max_lowres < avctx->lowres || avctx->lowres < 0) {
-        av_log(avctx, AV_LOG_ERROR, "The maximum value for lowres supported by the decoder is %d\n",
+        av_log(avctx, AV_LOG_WARNING, "The maximum value for lowres supported by the decoder is %d\n",
                avctx->codec->max_lowres);
-        ret = AVERROR(EINVAL);
-        goto free_and_end;
+        avctx->lowres = avctx->codec->max_lowres;
     }
     if (avctx->codec->encode) {
         int i;