On Sun, Mar 25, 2012 at 11:48:34AM +0100, Måns Rullgård wrote: > Diego Biurrun <[email protected]> writes: > > --- a/libavcodec/dsputil.c > > +++ b/libavcodec/dsputil.c > > @@ -2790,25 +2790,27 @@ av_cold void ff_dsputil_init(DSPContext* c, > > AVCodecContext *avctx) > > > > -#if CONFIG_ENCODERS > > +#if CONFIG_FAANDCT || CONFIG_JPEGDCT > > if (avctx->bits_per_raw_sample == 10) { > > c->fdct = ff_jpeg_fdct_islow_10; > > c->fdct248 = ff_fdct248_islow_10; > > } else { > > +#if CONFIG_FAANDCT > > + if(avctx->dct_algo==FF_DCT_FAAN) { > > + c->fdct = ff_faandct; > > + c->fdct248 = ff_faandct248; > > + } > > +#endif > > if(avctx->dct_algo==FF_DCT_FASTINT) { > > c->fdct = ff_fdct_ifast; > > c->fdct248 = ff_fdct_ifast248; > > } > > - else if(avctx->dct_algo==FF_DCT_FAAN) { > > - c->fdct = ff_faandct; > > - c->fdct248 = ff_faandct248; > > - } > > else { > > c->fdct = ff_jpeg_fdct_islow_8; //slow/accurate/default > > c->fdct248 = ff_fdct248_islow_8; > > } > > } > > Why are you moving those lines?
Somehow I was under the impression this would simplify the diff/ifdef, looking again now I can see no such thing, so I'll file it under the brainfart, rebase this patch and resend. Diego _______________________________________________ libav-devel mailing list [email protected] https://lists.libav.org/mailman/listinfo/libav-devel
