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 d5096fa..5584383 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 6ca6439..4f68828 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 47a354a..1edab49 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 e965ac9..5576085 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 367bc56..32d3eda 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 6e41327..4df5926 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 0090593..cfec826 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 fc90e24..f628102 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 bd399e7..9c3883c 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 ceae3db..0f036fa 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 0ed2e6d..f79c93e 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 343a785..55be359 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 bf1607f..74a84d8 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 69cb874..5d9234b 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)