mirror of https://git.ffmpeg.org/ffmpeg.git
Merge remote-tracking branch 'qatar/master'
* qatar/master: mpegvideo_enc: Don't call ff_h263dsp_init unconditionally Conflicts: libavcodec/mpegvideo_enc.c Merged-by: Michael Niedermayer <michaelni@gmx.at>
This commit is contained in:
commit
0269b30fef
|
@ -226,7 +226,8 @@ av_cold int ff_dct_encode_init(MpegEncContext *s) {
|
|||
if (ARCH_X86)
|
||||
ff_dct_encode_init_x86(s);
|
||||
|
||||
ff_h263dsp_init(&s->h263dsp);
|
||||
if (CONFIG_H263_ENCODER)
|
||||
ff_h263dsp_init(&s->h263dsp);
|
||||
if (!s->dct_quantize)
|
||||
s->dct_quantize = ff_dct_quantize_c;
|
||||
if (!s->denoise_dct)
|
||||
|
|
Loading…
Reference in New Issue