diff options
| author | Ronald S. Bultje <rsbultje@gmail.com> | 2010-12-29 17:34:00 +0000 |
|---|---|---|
| committer | Ronald S. Bultje <rsbultje@gmail.com> | 2010-12-29 17:34:00 +0000 |
| commit | 98928c83e02a51b25e1f1773d01f6a6c36daf0bd (patch) | |
| tree | 6bfa7ae24ae5b11fe46eb18c2d5d3a3125a3da69 /libavcodec/x86/h264_intrapred_init.c | |
| parent | 836132ec43441fc8560c267851e9aa1c0192300a (diff) | |
Mark recently added pred4x4_down_left_mmxext as CONFIG_GPL. Although Holger
initially said he'd be OK with relicensing, he also said he wanted to have
another look at the patch, and then he went on vacation, so let's play it
safe for now. We can consider removing this again later.
Originally committed as revision 26131 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'libavcodec/x86/h264_intrapred_init.c')
| -rw-r--r-- | libavcodec/x86/h264_intrapred_init.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/x86/h264_intrapred_init.c b/libavcodec/x86/h264_intrapred_init.c index 10a6dd6703..0047084826 100644 --- a/libavcodec/x86/h264_intrapred_init.c +++ b/libavcodec/x86/h264_intrapred_init.c @@ -95,8 +95,10 @@ void ff_h264_pred_init_x86(H264PredContext *h, int codec_id) h->pred16x16[DC_PRED8x8 ] = ff_pred16x16_dc_mmxext; h->pred8x8 [HOR_PRED8x8 ] = ff_pred8x8_horizontal_mmxext; h->pred4x4 [DC_PRED ] = ff_pred4x4_dc_mmxext; +#if CONFIG_GPL if (codec_id == CODEC_ID_VP8 || codec_id == CODEC_ID_H264) h->pred4x4 [DIAG_DOWN_LEFT_PRED ] = ff_pred4x4_down_left_mmxext; +#endif if (codec_id == CODEC_ID_VP8) { h->pred16x16[PLANE_PRED8x8] = ff_pred16x16_tm_vp8_mmxext; h->pred8x8 [DC_PRED8x8 ] = ff_pred8x8_dc_rv40_mmxext; |