Fixes for swig

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@335 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index d5096fa44f473f0185e1b6520445fca816b4978e..558438355fc6702936102e7fc513e867a3b9bd40 100644 (file)
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -12,6 +12,7 @@ OBJS = factory.o \
 CFLAGS+=-I../..
 
 LDFLAGS+=-lavformat -lavcodec $(EXTRA_LIBS)
+LDFLAGS+=-L../../framework -lmlt
 
 SRCS := $(OBJS:.o=.c)
 

diff --git a/src/modules/core/Makefile b/src/modules/core/Makefile
index 6ca643998671ea4b1557749441f5509ccd3ae4b8..4f688281814dd64652f85193c79279e980a7cd96 100644 (file)
--- a/src/modules/core/Makefile
+++ b/src/modules/core/Makefile
@@ -27,6 +27,8 @@ ASM_OBJS = composite_line_yuv_mmx.o
 
 CFLAGS += -I../..
 
+LDFLAGS+=-L../../framework -lmlt
+
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)

diff --git a/src/modules/dv/Makefile b/src/modules/dv/Makefile
index 47a354aa735ed3499acbbbaf319ab332720f459d..1edab494cd05595961998f9e605d63c420c65e89 100644 (file)
--- a/src/modules/dv/Makefile
+++ b/src/modules/dv/Makefile
@@ -10,6 +10,8 @@ CFLAGS += -I../..
 
 LDFLAGS += -ldv 
 
+LDFLAGS+=-L../../framework -lmlt
+
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)

diff --git a/src/modules/fezzik/Makefile b/src/modules/fezzik/Makefile
index e965ac937ac99d9cb347fc6a5241bfe964016960..5576085d3da81e18e5e2a65b31d448cb6ca81c61 100644 (file)
--- a/src/modules/fezzik/Makefile
+++ b/src/modules/fezzik/Makefile
@@ -8,6 +8,8 @@ OBJS = factory.o \
 
 CFLAGS += -I../..
 
+LDFLAGS+=-L../../framework -lmlt
+
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)

diff --git a/src/modules/gtk2/Makefile b/src/modules/gtk2/Makefile
index 367bc56d7edba31b9d61de2da50ec24ee7cb8620..32d3eda064cb2600b1f70d05d7fa1cb238ae8490 100644 (file)
--- a/src/modules/gtk2/Makefile
+++ b/src/modules/gtk2/Makefile
@@ -15,6 +15,8 @@ CFLAGS += `pkg-config gdk-pixbuf-2.0 --cflags` `pkg-config pangoft2 --cflags` -I
 
 LDFLAGS += `pkg-config gdk-pixbuf-2.0 --libs` `pkg-config pangoft2 --libs`
 
+LDFLAGS+=-L../../framework -lmlt
+
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)

diff --git a/src/modules/inigo/Makefile b/src/modules/inigo/Makefile
index 6e413279fc2fc4bd3c1fb1b40c69f56bbd5b77b9..4df5926376d3def801d1dd0a10cc785d2aabf0ea 100644 (file)
--- a/src/modules/inigo/Makefile
+++ b/src/modules/inigo/Makefile
@@ -7,6 +7,8 @@ OBJS = factory.o \
 
 CFLAGS += -I../..
 
+LDFLAGS+=-L../../framework -lmlt
+
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)

diff --git a/src/modules/normalize/Makefile b/src/modules/normalize/Makefile
index 0090593adc35d514d5d7cbc27bf9e30c0e172a62..cfec826bc27c09f3f4f905dac149d1938e393277 100644 (file)
--- a/src/modules/normalize/Makefile
+++ b/src/modules/normalize/Makefile
@@ -7,6 +7,8 @@ OBJS = factory.o \
 
 CFLAGS += -I../..
 
+LDFLAGS+=-L../../framework -lmlt
+
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)

diff --git a/src/modules/plus/Makefile b/src/modules/plus/Makefile
index fc90e24552b62fcd3bd670957c2e1653dfc1534e..f628102b16d02ee4dcaa1131a61be16e0722efda 100644 (file)
--- a/src/modules/plus/Makefile
+++ b/src/modules/plus/Makefile
@@ -10,6 +10,8 @@ OBJS = factory.o \
 
 CFLAGS += -I../..
 
+LDFLAGS+=-L../../framework -lmlt
+
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)

diff --git a/src/modules/plus/transition_affine.c b/src/modules/plus/transition_affine.c
index bd399e733f8fd428e470bfe2e2db3a2340c6c597..9c3883c8ca73e7cbe3665ca279d21b866305c5ab 100644 (file)
--- a/src/modules/plus/transition_affine.c
+++ b/src/modules/plus/transition_affine.c
@@ -517,7 +517,7 @@ static int transition_get_image( mlt_frame a_frame, uint8_t **image, mlt_image_f
        mlt_frame_get_image( a_frame, image, format, width, height, 1 );
 
        // Calculate the region now
-       composite_calculate( &result, this, a_frame, ( float )position / ( out - in + 1 ) );
+       composite_calculate( &result, this, a_frame, ( float )( position - in ) / ( out - in + 1 ) );
 
        // Fetch the b frame image
        result.w = ( int )( result.w * *width / result.nw );

diff --git a/src/modules/resample/Makefile b/src/modules/resample/Makefile
index ceae3db6d01a4cfbb8ac4a6c631176562dc6ae13..0f036fa0e0cf1d2a8f6272d84b2b89091961a109 100644 (file)
--- a/src/modules/resample/Makefile
+++ b/src/modules/resample/Makefile
@@ -9,6 +9,8 @@ CFLAGS += -I../..
 
 LDFLAGS += -lsamplerate
 
+LDFLAGS+=-L../../framework -lmlt
+
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)

diff --git a/src/modules/sdl/Makefile b/src/modules/sdl/Makefile
index 0ed2e6d5e264e6d73397aeab871df5197c754ddd..f79c93edeb4ad8648307ee6b191250718cbf72c6 100644 (file)
--- a/src/modules/sdl/Makefile
+++ b/src/modules/sdl/Makefile
@@ -9,6 +9,8 @@ CFLAGS += -I../.. `sdl-config --cflags`
 
 LDFLAGS += `sdl-config --libs`
 
+LDFLAGS+=-L../../framework -lmlt
+
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)

diff --git a/src/modules/sox/Makefile b/src/modules/sox/Makefile
index 343a785dde348d36cf4ada29c73d2b4d9f0e961a..55be3596456cf99606f86057b52303311d4300d8 100644 (file)
--- a/src/modules/sox/Makefile
+++ b/src/modules/sox/Makefile
@@ -9,6 +9,8 @@ CFLAGS += -I../../ -I/usr/include/sox
 
 LDFLAGS += -lst -lpopt -lvorbis -logg -lvorbisfile -lvorbisenc
 
+LDFLAGS+=-L../../framework -lmlt
+
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)

diff --git a/src/modules/vorbis/Makefile b/src/modules/vorbis/Makefile
index bf1607fb1c44d7c9085032656c8e8cdda77c9d0d..74a84d86f85c30e95607c6fb345f0d2d46ed42b2 100644 (file)
--- a/src/modules/vorbis/Makefile
+++ b/src/modules/vorbis/Makefile
@@ -9,6 +9,8 @@ CFLAGS += -I../..
 
 LDFLAGS += -lvorbisfile -lvorbis
 
+LDFLAGS+=-L../../framework -lmlt
+
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)

diff --git a/src/modules/westley/Makefile b/src/modules/westley/Makefile
index 69cb87473b85a0bf6db210d409398ac1364fd399..5d9234bf313aabeee53ea765e374293d8e2d47cb 100644 (file)
--- a/src/modules/westley/Makefile
+++ b/src/modules/westley/Makefile
@@ -10,6 +10,8 @@ CFLAGS += -I../../ `xml2-config --cflags`
 
 LDFLAGS += `xml2-config --libs`
 
+LDFLAGS+=-L../../framework -lmlt
+
 SRCS := $(OBJS:.o=.c)
 
 all:   $(TARGET)