[FFmpeg-cvslog] r25114 - trunk/libavcodec/utils.c

cehoyos subversion
Tue Sep 14 00:03:30 CEST 2010


Author: cehoyos
Date: Tue Sep 14 00:03:29 2010
New Revision: 25114

Log:
Test lowres before codec init.

Modified:
   trunk/libavcodec/utils.c

Modified: trunk/libavcodec/utils.c
==============================================================================
--- trunk/libavcodec/utils.c	Mon Sep 13 15:25:51 2010	(r25113)
+++ trunk/libavcodec/utils.c	Tue Sep 14 00:03:29 2010	(r25114)
@@ -504,13 +504,13 @@ int attribute_align_arg avcodec_open(AVC
         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;



More information about the ffmpeg-cvslog mailing list