From de09bd0b00071c23666dc21bb15c619c0c9095d6 Mon Sep 17 00:00:00 2001 From: lilo_booter Date: Thu, 8 Jul 2004 09:26:15 +0000 Subject: [PATCH] Fixes for swig git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@335 d19143bc-622f-0410-bfdd-b5b2a6649095 --- src/modules/avformat/Makefile | 1 + src/modules/core/Makefile | 2 ++ src/modules/dv/Makefile | 2 ++ src/modules/fezzik/Makefile | 2 ++ src/modules/gtk2/Makefile | 2 ++ src/modules/inigo/Makefile | 2 ++ src/modules/normalize/Makefile | 2 ++ src/modules/plus/Makefile | 2 ++ src/modules/plus/transition_affine.c | 2 +- src/modules/resample/Makefile | 2 ++ src/modules/sdl/Makefile | 2 ++ src/modules/sox/Makefile | 2 ++ src/modules/vorbis/Makefile | 2 ++ src/modules/westley/Makefile | 2 ++ 14 files changed, 26 insertions(+), 1 deletion(-) diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile index d5096fa4..55843835 100644 --- 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 6ca64399..4f688281 100644 --- 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 47a354aa..1edab494 100644 --- 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 e965ac93..5576085d 100644 --- 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 367bc56d..32d3eda0 100644 --- 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 6e413279..4df59263 100644 --- 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 0090593a..cfec826b 100644 --- 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 fc90e245..f628102b 100644 --- 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 bd399e73..9c3883c8 100644 --- 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 ceae3db6..0f036fa0 100644 --- 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 0ed2e6d5..f79c93ed 100644 --- 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 343a785d..55be3596 100644 --- 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 bf1607fb..74a84d86 100644 --- 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 69cb8747..5d9234bf 100644 --- 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) -- 2.39.2