From 98928c83e02a51b25e1f1773d01f6a6c36daf0bd Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Wed, 29 Dec 2010 17:34:00 +0000 Subject: [PATCH] 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 --- libavcodec/x86/h264_intrapred.asm | 3 ++- libavcodec/x86/h264_intrapred_init.c | 2 ++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/libavcodec/x86/h264_intrapred.asm b/libavcodec/x86/h264_intrapred.asm index 14a6038785..06a0148aeb 100644 --- a/libavcodec/x86/h264_intrapred.asm +++ b/libavcodec/x86/h264_intrapred.asm @@ -1108,7 +1108,7 @@ cglobal pred4x4_vertical_vp8_mmxext, 3,3 ;----------------------------------------------------------------------------- ; void pred4x4_down_left_mmxext(uint8_t *src, const uint8_t *topright, int stride) ;----------------------------------------------------------------------------- - +%ifdef CONFIG_GPL INIT_MMX cglobal pred4x4_down_left_mmxext, 3,3 sub r0, r2 @@ -1132,3 +1132,4 @@ cglobal pred4x4_down_left_mmxext, 3,3 psrlq m0, 8 movd [r1+r2*2], m0 RET +%endif 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;