[haiku-commits] r38563 - haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/x86
- From: superstippi@xxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Tue, 7 Sep 2010 13:15:48 +0200 (CEST)
Author: stippi
Date: 2010-09-07 13:15:48 +0200 (Tue, 07 Sep 2010)
New Revision: 38563
Changeset: http://dev.haiku-os.org/changeset/38563
Modified:
haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx.c
Log:
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.
Modified:
haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx.c
===================================================================
--- haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx.c
2010-09-07 11:11:51 UTC (rev 38562)
+++ haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/x86/dsputil_mmx.c
2010-09-07 11:15:48 UTC (rev 38563)
@@ -2390,7 +2390,7 @@
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)
{
Other related posts:
- » [haiku-commits] r38563 - haiku/trunk/src/add-ons/media/plugins/ffmpeg/libavcodec/x86 - superstippi
