# HG changeset patch
# User aurel
# Date 1183628909 0
# Node ID 413c5e2eff68698cad8549f79a2a31f51a3192aa
# Parent  b52fd9b223bb2cb589a5a3c2b95dff3cc699803a
move mpeg encoder specific initialization in the encoder specific file

diff -r b52fd9b223bb -r 413c5e2eff68 mpegvideo.c
--- a/mpegvideo.c	Thu Jul 05 09:21:55 2007 +0000
+++ b/mpegvideo.c	Thu Jul 05 09:48:29 2007 +0000
@@ -162,19 +162,6 @@
     MPV_common_init_bfin(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){
-        s->dct_quantize= dct_quantize_trellis_c; //move before MPV_common_init_*
-    }
-
-#endif //CONFIG_ENCODERS
-
     /* load & permutate scantables
        note: only wmv uses different ones
     */
diff -r b52fd9b223bb -r 413c5e2eff68 mpegvideo_enc.c
--- a/mpegvideo_enc.c	Thu Jul 05 09:21:55 2007 +0000
+++ b/mpegvideo_enc.c	Thu Jul 05 09:48:29 2007 +0000
@@ -660,6 +660,14 @@
     if (MPV_common_init(s) < 0)
         return -1;
 
+    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)
+        s->dct_quantize = dct_quantize_trellis_c;
+
     if(s->modified_quant)
         s->chroma_qscale_table= ff_h263_chroma_qscale_table;
     s->progressive_frame=