[FFmpeg-cvslog] r9480 - in trunk/libavcodec: mpegvideo.c mpegvideo_enc.c

[aurel]

Author: aurel
Date: Thu Jul  5 11:48:29 2007
New Revision: 9480

Log:
move mpeg encoder specific initialization in the encoder specific file

Modified:
   trunk/libavcodec/mpegvideo.c
   trunk/libavcodec/mpegvideo_enc.c

Modified: trunk/libavcodec/mpegvideo.c
==============================================================================
--- trunk/libavcodec/mpegvideo.c	(original)
+++ trunk/libavcodec/mpegvideo.c	Thu Jul  5 11:48:29 2007
@@ -162,19 +162,6 @@ int DCT_common_init(MpegEncContext *s)
     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
     */

Modified: trunk/libavcodec/mpegvideo_enc.c
==============================================================================
--- trunk/libavcodec/mpegvideo_enc.c	(original)
+++ trunk/libavcodec/mpegvideo_enc.c	Thu Jul  5 11:48:29 2007
@@ -660,6 +660,14 @@ int MPV_encode_init(AVCodecContext *avct
     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=