[Ffmpeg-cvslog] CVS: ffmpeg/libavcodec ratecontrol.c,1.55,1.56

[Corey Hickey CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavcodec
In directory mail:/var2/tmp/cvs-serv12395/libavcodec

Modified Files:
	ratecontrol.c 
Log Message:
make ff_rate_control_init() bail out if rc_strategy==1 and lavc wasn't
compiled with xvid support.


Index: ratecontrol.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavcodec/ratecontrol.c,v
retrieving revision 1.55
retrieving revision 1.56
diff -u -d -r1.55 -r1.56
--- ratecontrol.c	25 Jan 2006 02:16:27 -0000	1.55
+++ ratecontrol.c	17 Mar 2006 16:40:10 -0000	1.56
@@ -117,11 +117,15 @@
 
             p= next;
         }
-#ifdef CONFIG_XVID
         //FIXME maybe move to end
-        if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID)
+        if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID) {
+#ifdef CONFIG_XVID
             return ff_xvid_rate_control_init(s);
+#else
+            av_log(s->avctx, AV_LOG_ERROR, "XviD ratecontrol requires libavcodec compiled with XviD support\n");
+            return -1;
 #endif
+        }
 
         if(init_pass2(s) < 0) return -1;
     }