From 20d496c56c1649ee59bb14b805f82ffe3f0da906 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Stephan=20A=C3=9Fmus?= Date: Tue, 7 Sep 2010 11:15:48 +0000 Subject: [PATCH] ff_x264_deblock_v8_luma_intra_mmxext is GPL and needs to be wrapped in a CONFIG_GPL #ifdef (should be upstreamed, actually). This fixes the GCC2 build (and probably GCC4) if the Haiku build is not configured to include GPL add-ons. git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@38563 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx.c b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx.c index 3e57fac31a..804b6ab73b 100644 --- a/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx.c +++ b/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx.c @@ -2390,7 +2390,7 @@ void ff_x264_deblock_h_luma_intra_mmxext(uint8_t *pix, int stride, int alpha, in void ff_x264_deblock_v_luma_intra_sse2(uint8_t *pix, int stride, int alpha, int beta); void ff_x264_deblock_h_luma_intra_sse2(uint8_t *pix, int stride, int alpha, int beta); -#if HAVE_YASM && ARCH_X86_32 +#if CONFIG_GPL && HAVE_YASM && ARCH_X86_32 void ff_x264_deblock_v8_luma_intra_mmxext(uint8_t *pix, int stride, int alpha, int beta); static void ff_x264_deblock_v_luma_intra_mmxext(uint8_t *pix, int stride, int alpha, int beta) {