improve compatibility to compile composite sse2 (macports-35243)

diff --git a/AUTHORS b/AUTHORS
index d91b719fc5fe6bb7edf984ad7addfc31c6001b8e..a7a5b1541ef795689542a590edfd989b6dc6adb6 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -5,10 +5,10 @@ MLT framework is maintained by:
 Dan Dennedy <dan@dennedy.org>
 
 MLT module authors and maintainers:
-
 Charles Yates <charles.yates@pandora.be>
 Dan Dennedy <dan@dennedy.org>
 Stephane Fillod (effectv)
 Marco Gittler <g.marco@freenet.de> (frei0r, oldfilm, qimage/kdenlivetitle)
 Jean-Baptiste Mardelle <jb@ader.ch> (kdenlive, qimage)
 Zachary Drew (motion_est)
+Maksym Veremeyenko <verem@m1stereo.tv>

diff --git a/src/modules/core/Makefile b/src/modules/core/Makefile
index b86c7f1c611427caeef9331d61cb1b97fc209faa..dcaabdd7880cf5e59ef437491d1be84be61d133d 100644 (file)
--- 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 11f91595f79cc9498d07c43fe94b83661c63a344..f581fac26cae58c6fc2267253b9900b78038c925 100644 (file)
--- 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 <verem@m1stereo.tv>
+ *
+ * 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 <inttypes.h>
 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 45d6a23be54021d48d1909f0b9788ee526796ea1..b0fd5b40861ba5d518f685ac891826fc49892893 100644 (file)
--- 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 )