Mercurial > libavcodec.hg

changeset 5211:413c5e2eff68 libavcodec

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
move mpeg encoder specific initialization in the encoder specific file
author aurel
date Thu, 05 Jul 2007 09:48:29 +0000
parents b52fd9b223bb
children 12b08ebc40b9
files mpegvideo.c mpegvideo_enc.c
diffstat 2 files changed, 8 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- 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
     */
--- 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=