From 022fad483385f446f1efd0867b6fbaa858198719 Mon Sep 17 00:00:00 2001 From: Corey Hickey Date: Fri, 17 Mar 2006 16:40:10 +0000 Subject: [PATCH] make ff_rate_control_init() bail out if rc_strategy==1 and lavc wasn't compiled with xvid support. Originally committed as revision 5176 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/ratecontrol.c | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index 29dc1f4956..a6f8036489 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -117,11 +117,15 @@ int ff_rate_control_init(MpegEncContext *s) 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; }