Revision 19531051 libavcodec/ratecontrol.c

View differences:

libavcodec/ratecontrol.c
117 117

  
118 118
            p= next;
119 119
        }
120

  
120
#ifdef CONFIG_XVID
121 121
        //FIXME maybe move to end
122 122
        if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID)
123 123
            return ff_xvid_rate_control_init(s);
124
#endif
124 125

  
125 126
        if(init_pass2(s) < 0) return -1;
126 127
    }
......
187 188

  
188 189
    av_freep(&rcc->entry);
189 190

  
191
#ifdef CONFIG_XVID
190 192
    if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID)
191 193
        ff_xvid_rate_control_uninit(s);
194
#endif
192 195
}
193 196

  
194 197
static inline double qp2bits(RateControlEntry *rce, double qp){
......
648 651
    Picture * const pic= &s->current_picture;
649 652
    emms_c();
650 653

  
654
#ifdef CONFIG_XVID
651 655
    if((s->flags&CODEC_FLAG_PASS2) && s->avctx->rc_strategy == FF_RC_STRATEGY_XVID)
652 656
        return ff_xvid_rate_estimate_qscale(s, dry_run);
657
#endif
653 658

  
654 659
    get_qminmax(&qmin, &qmax, s, pict_type);
655 660

  

Also available in: Unified diff