diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2014-01-22 23:36:33 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2014-01-22 23:36:33 +0100 |
| commit | 0269b30fefba3f2a5b9a1ceda67692b4f6c434e5 (patch) | |
| tree | 438a9eca4994b98c942f32915cb63a44658a881f /libavcodec | |
| parent | ef00ef7553fc3b0ab842eccea068ede5eb41d6b0 (diff) | |
| parent | cff480e49d73640c980922626e57c9889bb4b18d (diff) | |
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>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/mpegvideo_enc.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libavcodec/mpegvideo_enc.c b/libavcodec/mpegvideo_enc.c index 62c93458b7..eb31814780 100644 --- a/libavcodec/mpegvideo_enc.c +++ b/libavcodec/mpegvideo_enc.c @@ -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) |