mirror of
https://github.com/xenia-project/FFmpeg.git
synced 2024-11-24 20:19:55 +00:00
move mpeg encoder specific initialization in the encoder specific file
Originally committed as revision 9480 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
eaa7557c73
commit
53727262cb
@ -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
|
||||
*/
|
||||
|
@ -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=
|
||||
|
Loading…
Reference in New Issue
Block a user