diff options
| author | Aurelien Jacobs <aurel@gnuage.org> | 2007-07-05 09:48:29 +0000 |
|---|---|---|
| committer | Aurelien Jacobs <aurel@gnuage.org> | 2007-07-05 09:48:29 +0000 |
| commit | 53727262cb8c68d2a8beefb871b8852eacc3198d (patch) | |
| tree | 28c3071f2c56037f015c23891b5d666b7048b882 | |
| parent | eaa7557c73aa40dcea2a0444e86820acff921ef1 (diff) | |
move mpeg encoder specific initialization in the encoder specific file
Originally committed as revision 9480 to svn://svn.ffmpeg.org/ffmpeg/trunk
| -rw-r--r-- | libavcodec/mpegvideo.c | 13 | ||||
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 8 |
2 files changed, 8 insertions, 13 deletions
diff --git a/libavcodec/mpegvideo.c b/libavcodec/mpegvideo.c index c71a96a342..34fa8910aa 100644 --- a/libavcodec/mpegvideo.c +++ b/libavcodec/mpegvideo.c @@ -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 */ diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 5cd2e91752..204a51cbbb 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -660,6 +660,14 @@ int MPV_encode_init(AVCodecContext *avctx) 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= |