[SCM] libav/experimental: Test lowres before codec init.

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 527c91e34a0e1b49dbaede9fa1a7cc81ef8a3b0a
Author: Carl Eugen Hoyos <cehoyos at rainbow.studorg.tuwien.ac.at>
Date:   Mon Sep 13 22:03:29 2010 +0000

    Test lowres before codec init.
    
    Originally committed as revision 25114 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavcodec/utils.c b/libavcodec/utils.c
index 442b9ef..e12b677 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;

-- 
Libav/FFmpeg packaging