Commit 022fad48 authored by Corey Hickey's avatar Corey Hickey

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
parent 13c97a5a
...@@ -117,11 +117,15 @@ int ff_rate_control_init(MpegEncContext *s) ...@@ -117,11 +117,15 @@ int ff_rate_control_init(MpegEncContext *s)
p= next; p= next;
} }
#ifdef CONFIG_XVID
//FIXME maybe move to end //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); 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 #endif
}
if(init_pass2(s) < 0) return -1; if(init_pass2(s) < 0) return -1;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment