From 255eccab6e75acc16db788f2ed33da53ee018928 Mon Sep 17 00:00:00 2001 From: Benoit Fouet Date: Wed, 20 Jun 2007 11:01:50 +0000 Subject: [PATCH] move dct_quantize and denoise_dct function pointers initialization to C functions after arch dependant initializations Originally committed as revision 9375 to svn://svn.ffmpeg.org/ffmpeg/trunk --- libavcodec/mpegvideo.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index 70ef18fba9..9233ff3258 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -271,11 +271,6 @@ int DCT_common_init(MpegEncContext *s) s->dct_unquantize_mpeg2_intra = dct_unquantize_mpeg2_intra_bitexact; s->dct_unquantize_mpeg2_inter = dct_unquantize_mpeg2_inter_c; -#ifdef CONFIG_ENCODERS - s->dct_quantize= dct_quantize_c; - s->denoise_dct= denoise_dct_c; -#endif //CONFIG_ENCODERS - #if defined(HAVE_MMX) MPV_common_init_mmx(s); #elif defined(ARCH_ALPHA) @@ -293,6 +288,10 @@ int DCT_common_init(MpegEncContext *s) #endif #ifdef CONFIG_ENCODERS + if(!s->dct_quantize) + s->dct_quantize= dct_quantize_c; + if(!s->denoise_dct) + s->denoise_dct= denoise_dct_c; s->fast_dct_quantize= s->dct_quantize; if(s->flags&CODEC_FLAG_TRELLIS_QUANT){