diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2006-01-25 02:16:27 +0000 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2006-01-25 02:16:27 +0000 |
| commit | 1953105102e08e501a516d9ac9ad76296b25a1fb (patch) | |
| tree | cc07dd24ebef94d6d790d9a4b2ba325ac7f3179c /libavcodec | |
| parent | 64b7c5b6f6cab1f1332b0886ce0ab0fe2ea423af (diff) | |
| download | ffmpeg-1953105102e08e501a516d9ac9ad76296b25a1fb.tar.gz | |
10l forgot #ifdef CONFIG_XVID
Originally committed as revision 4895 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/ratecontrol.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/libavcodec/ratecontrol.c b/libavcodec/ratecontrol.c index 8ecec3c2f5..29dc1f4956 100644 --- a/libavcodec/ratecontrol.c +++ b/libavcodec/ratecontrol.c @@ -117,10 +117,11 @@ 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) return ff_xvid_rate_control_init(s); +#endif if(init_pass2(s) < 0) return -1; } @@ -187,8 +188,10 @@ void ff_rate_control_uninit(MpegEncContext *s) av_freep(&rcc->entry); +#ifdef CONFIG_XVID if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID) ff_xvid_rate_control_uninit(s); +#endif } static inline double qp2bits(RateControlEntry *rce, double qp){ @@ -648,8 +651,10 @@ float ff_rate_estimate_qscale(MpegEncContext *s, int dry_run) Picture * const pic= &s->current_picture; emms_c(); +#ifdef CONFIG_XVID if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID) return ff_xvid_rate_estimate_qscale(s, dry_run); +#endif get_qminmax(&qmin, &qmax, s, pict_type); |