aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBenoit Fouet <benoit.fouet@free.fr>2007-06-20 11:01:50 +0000
committerBenoit Fouet <benoit.fouet@free.fr>2007-06-20 11:01:50 +0000
commit255eccab6e75acc16db788f2ed33da53ee018928 (patch)
tree2aa8d9cb8e6c0dd4f91e6081847b5907608617b0
parent24456882f378c3154645b2b833b6f5af6e6f3ef7 (diff)
downloadffmpeg-255eccab6e75acc16db788f2ed33da53ee018928.tar.gz
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
-rw-r--r--libavcodec/mpegvideo.c9
1 files 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){