diff options
| author | Diego Biurrun <diego@biurrun.de> | 2007-07-03 09:12:55 +0000 |
|---|---|---|
| committer | Diego Biurrun <diego@biurrun.de> | 2007-07-03 09:12:55 +0000 |
| commit | 82634feeb5fb970e876c9cbdd5fe9c06fb41e926 (patch) | |
| tree | a9d02439ea4545583e9a402a89d441bfd4cc18ee /libavcodec/ratecontrol.c | |
| parent | 737b7fb93e90dbdf8fd7c003a6115ce88575040c (diff) | |
| download | ffmpeg-82634feeb5fb970e876c9cbdd5fe9c06fb41e926.tar.gz | |
CONFIG_XVID --> CONFIG_LIBXVID
Originally committed as revision 9466 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/ratecontrol.c')
| -rw-r--r-- | libavcodec/ratecontrol.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index 1ca9b68e67..d08729c1de 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -184,7 +184,7 @@ int ff_rate_control_init(MpegEncContext *s) //FIXME maybe move to end if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID) { -#ifdef CONFIG_XVID +#ifdef CONFIG_LIBXVID return ff_xvid_rate_control_init(s); #else av_log(s->avctx, AV_LOG_ERROR, "XviD ratecontrol requires libavcodec compiled with XviD support\n"); @@ -260,7 +260,7 @@ void ff_rate_control_uninit(MpegEncContext *s) ff_eval_free(rcc->rc_eq_eval); av_freep(&rcc->entry); -#ifdef CONFIG_XVID +#ifdef CONFIG_LIBXVID if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID) ff_xvid_rate_control_uninit(s); #endif @@ -676,7 +676,7 @@ float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run) Picture * const pic= &s->current_picture; emms_c(); -#ifdef CONFIG_XVID +#ifdef CONFIG_LIBXVID if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID) return ff_xvid_rate_estimate_qscale(s, dry_run); #endif |