From: Dan Dennedy Date: Fri, 20 Jul 2012 16:29:45 +0000 (-0700) Subject: improve compatibility to compile composite sse2 (macports-35243) X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=b97a03508b4d07d0f36e29ca2ea8ce4bef26c0bb;p=mlt improve compatibility to compile composite sse2 (macports-35243) --- diff --git a/AUTHORS b/AUTHORS index d91b719f..a7a5b154 100644 --- a/AUTHORS +++ b/AUTHORS @@ -5,10 +5,10 @@ MLT framework is maintained by: Dan Dennedy MLT module authors and maintainers: - Charles Yates Dan Dennedy Stephane Fillod (effectv) Marco Gittler (frei0r, oldfilm, qimage/kdenlivetitle) Jean-Baptiste Mardelle (kdenlive, qimage) Zachary Drew (motion_est) +Maksym Veremeyenko diff --git a/src/modules/core/Makefile b/src/modules/core/Makefile index b86c7f1c..dcaabdd7 100644 --- a/src/modules/core/Makefile +++ b/src/modules/core/Makefile @@ -43,6 +43,10 @@ OBJS = factory.o \ consumer_multi.o \ consumer_null.o +ifdef SSE2_FLAGS +OBJS += composite_line_yuv_sse2_simple.o +endif + ASM_OBJS = SRCS := $(OBJS:.o=.c) diff --git a/src/modules/core/composite_line_yuv_sse2_simple.c b/src/modules/core/composite_line_yuv_sse2_simple.c index 11f91595..f581fac2 100644 --- a/src/modules/core/composite_line_yuv_sse2_simple.c +++ b/src/modules/core/composite_line_yuv_sse2_simple.c @@ -1,3 +1,24 @@ +/* + * composite_line_yuv_sse2_simple.c + * Copyright (C) 2003-2004 Ushodaya Enterprises Limited + * Author: Maksym Veremeyenko + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU Lesser General Public + * License as published by the Free Software Foundation; either + * version 2.1 of the License, or (at your option) any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this library; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + */ + +#include void composite_line_yuv_sse2_simple(uint8_t *dest, uint8_t *src, int width, uint8_t *alpha_b, uint8_t *alpha_a, int weight) { const static unsigned char const1[] = diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c index 45d6a23b..b0fd5b40 100644 --- a/src/modules/core/transition_composite.c +++ b/src/modules/core/transition_composite.c @@ -366,7 +366,7 @@ static inline uint8_t sample_mix( uint8_t dest, uint8_t src, int mix ) /** Composite a source line over a destination line */ #if defined(USE_SSE) && defined(ARCH_X86_64) -#include "composite_line_yuv_sse2_simple.c" +void composite_line_yuv_sse2_simple(uint8_t *dest, uint8_t *src, int width, uint8_t *alpha_b, uint8_t *alpha_a, int weight); #endif void composite_line_yuv( uint8_t *dest, uint8_t *src, int width, uint8_t *alpha_b, uint8_t *alpha_a, int weight, uint16_t *luma, int soft, uint32_t step )