commit b97a03508b4d07d0f36e29ca2ea8ce4bef26c0bb
Author: Dan Dennedy <dan@dennedy.org>
Date: Fri Jul 20 09:29:45 2012 -0700
improve compatibility to compile composite sse2 (macports-35243)
diff --git a/AUTHORS b/AUTHORS
index d91b719..a7a5b15 100644
a
|
b
|
MLT framework is maintained by: |
5 | 5 | Dan Dennedy <dan@dennedy.org> |
6 | 6 | |
7 | 7 | MLT module authors and maintainers: |
8 | | |
9 | 8 | Charles Yates <charles.yates@pandora.be> |
10 | 9 | Dan Dennedy <dan@dennedy.org> |
11 | 10 | Stephane Fillod (effectv) |
12 | 11 | Marco Gittler <g.marco@freenet.de> (frei0r, oldfilm, qimage/kdenlivetitle) |
13 | 12 | Jean-Baptiste Mardelle <jb@ader.ch> (kdenlive, qimage) |
14 | 13 | Zachary Drew (motion_est) |
| 14 | Maksym Veremeyenko <verem@m1stereo.tv> |
diff --git a/src/modules/core/Makefile b/src/modules/core/Makefile
index b86c7f1..dcaabdd 100644
a
|
b
|
OBJS = factory.o \ |
43 | 43 | consumer_multi.o \ |
44 | 44 | consumer_null.o |
45 | 45 | |
| 46 | ifdef SSE2_FLAGS |
| 47 | OBJS += composite_line_yuv_sse2_simple.o |
| 48 | endif |
| 49 | |
46 | 50 | ASM_OBJS = |
47 | 51 | |
48 | 52 | 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 11f9159..f581fac 100644
a
|
b
|
|
| 1 | /* |
| 2 | * composite_line_yuv_sse2_simple.c |
| 3 | * Copyright (C) 2003-2004 Ushodaya Enterprises Limited |
| 4 | * Author: Maksym Veremeyenko <verem@m1stereo.tv> |
| 5 | * |
| 6 | * This library is free software; you can redistribute it and/or |
| 7 | * modify it under the terms of the GNU Lesser General Public |
| 8 | * License as published by the Free Software Foundation; either |
| 9 | * version 2.1 of the License, or (at your option) any later version. |
| 10 | * |
| 11 | * This library is distributed in the hope that it will be useful, |
| 12 | * but WITHOUT ANY WARRANTY; without even the implied warranty of |
| 13 | * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU |
| 14 | * Lesser General Public License for more details. |
| 15 | * |
| 16 | * You should have received a copy of the GNU Lesser General Public |
| 17 | * License along with this library; if not, write to the Free Software |
| 18 | * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA |
| 19 | */ |
| 20 | |
| 21 | #include <inttypes.h> |
1 | 22 | void composite_line_yuv_sse2_simple(uint8_t *dest, uint8_t *src, int width, uint8_t *alpha_b, uint8_t *alpha_a, int weight) |
2 | 23 | { |
3 | 24 | const static unsigned char const1[] = |
diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c
index 45d6a23..b0fd5b4 100644
a
|
b
|
static inline uint8_t sample_mix( uint8_t dest, uint8_t src, int mix ) |
366 | 366 | /** Composite a source line over a destination line |
367 | 367 | */ |
368 | 368 | #if defined(USE_SSE) && defined(ARCH_X86_64) |
369 | | #include "composite_line_yuv_sse2_simple.c" |
| 369 | void composite_line_yuv_sse2_simple(uint8_t *dest, uint8_t *src, int width, uint8_t *alpha_b, uint8_t *alpha_a, int weight); |
370 | 370 | #endif |
371 | 371 | |
372 | 372 | 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 ) |