]>
git.sesse.net Git - mlt/log
Marco Gittler [Sun, 2 Aug 2009 21:03:59 +0000 (23:03 +0200)]
Merge commit 'jbm/kdenlivetitle' into kdenlivetitle
j-b-m [Sun, 2 Aug 2009 20:22:21 +0000 (22:22 +0200)]
Add support for svg items in titles
modified: configure
modified: kdenlivetitle_wrapper.cpp
Marco Gittler [Sun, 2 Aug 2009 18:53:10 +0000 (20:53 +0200)]
Merge commit 'jbm/kdenlivetitle' into kdenlivetitle
j-b-m [Sun, 2 Aug 2009 17:45:59 +0000 (19:45 +0200)]
Dont's set Graphicscene parent to avoid warning message, fix display of images
modified: kdenlivetitle_wrapper.cpp
j-b-m [Sun, 2 Aug 2009 17:16:26 +0000 (19:16 +0200)]
remove unused var
modified: kdenlivetitle_wrapper.h
j-b-m [Sun, 2 Aug 2009 17:14:35 +0000 (19:14 +0200)]
Fix errors in caching + mem leaks, fix resize issue
modified: kdenlivetitle_wrapper.cpp
modified: kdenlivetitle_wrapper.h
modified: producer_kdenlivetitle.c
Marco Gittler [Sat, 1 Aug 2009 19:31:40 +0000 (21:31 +0200)]
Merge commit 'jbm/kdenlivetitle' into kdenlivetitle
j-b-m [Sat, 1 Aug 2009 14:25:12 +0000 (16:25 +0200)]
Rewrote caching, similar to qimage producer
modified: kdenlivetitle_wrapper.cpp
modified: kdenlivetitle_wrapper.h
modified: producer_kdenlivetitle.c
j-b-m [Sat, 1 Aug 2009 13:46:45 +0000 (15:46 +0200)]
Cache image if there is no animation
modified: kdenlivetitle_wrapper.cpp
gmarco [Fri, 31 Jul 2009 17:59:12 +0000 (19:59 +0200)]
Merge commit 'jbm/kdenlivetitle' into kdenlivetitle
j-b-m [Fri, 31 Jul 2009 17:08:33 +0000 (19:08 +0200)]
Use QImage instead of QPixmap, add myself in copyright
modified: kdenlivetitle_wrapper.cpp
modified: kdenlivetitle_wrapper.h
modified: producer_kdenlivetitle.c
Marco Gittler [Fri, 31 Jul 2009 12:16:14 +0000 (14:16 +0200)]
kdenlivetitle_wrapper.cpp: qt 4.4 fix for scale
Marco Gittler [Fri, 31 Jul 2009 11:30:01 +0000 (13:30 +0200)]
Merge commit 'jbm/kdenlivetitle' into kdenlivetitle
j-b-m [Fri, 31 Jul 2009 11:11:54 +0000 (13:11 +0200)]
don't use cache, just normal properties to store scene
modified: kdenlivetitle_wrapper.cpp
modified: kdenlivetitle_wrapper.h
j-b-m [Fri, 31 Jul 2009 07:37:10 +0000 (09:37 +0200)]
Rescale title when they are played with a different profile
modified: kdenlivetitle_wrapper.cpp
modified: kdenlivetitle_wrapper.h
modified: producer_kdenlivetitle.c
Marco Gittler [Thu, 30 Jul 2009 21:30:33 +0000 (23:30 +0200)]
Merge commit 'jbm/kdenlivetitle' into kdenlivetitle
j-b-m [Thu, 30 Jul 2009 21:20:13 +0000 (23:20 +0200)]
Fix image size, fix utf-8 characters in titles
modified: kdenlivetitle_wrapper.cpp
modified: producer_kdenlivetitle.c
Marco Gittler [Wed, 29 Jul 2009 17:26:53 +0000 (19:26 +0200)]
Merge commit 'jbm/kdenlivetitle' into kdenlivetitle
j-b-m [Wed, 29 Jul 2009 16:41:17 +0000 (18:41 +0200)]
Fix use of several title producers in one instance of Kdenlive
modified: kdenlivetitle_wrapper.cpp
modified: kdenlivetitle_wrapper.h
modified: producer_kdenlivetitle.c
Dan Dennedy [Tue, 28 Jul 2009 04:18:28 +0000 (21:18 -0700)]
Revert "Fix bug preventing deletion of one frame region"
This reverts commit
17611c672d6a81b3f1b4b445a83606b087603ceb .
Signed-off-by: Dan Dennedy <dan@dennedy.org>
gmarco [Mon, 27 Jul 2009 18:18:11 +0000 (20:18 +0200)]
kdenlivetitle_wrapper.cpp: fixed merge conflict
Marco Gittler [Mon, 27 Jul 2009 06:32:36 +0000 (08:32 +0200)]
Merge commit 'jbm/kdenlivetitle' into kdenlivetitle
j-b-m [Mon, 27 Jul 2009 00:18:46 +0000 (02:18 +0200)]
debug --
modified: producer_kdenlivetitle.c
j-b-m [Sun, 26 Jul 2009 22:56:51 +0000 (00:56 +0200)]
Cleanup + fix crashes when used in Kdenlive
modified: kdenlivetitle_wrapper.cpp
modified: kdenlivetitle_wrapper.h
modified: producer_kdenlivetitle.c
Marco Gittler [Sun, 26 Jul 2009 19:29:16 +0000 (21:29 +0200)]
Merge branch 'master' into kdenlivetitle
j-b-m [Fri, 24 Jul 2009 14:15:32 +0000 (16:15 +0200)]
Fix mem leak
modified: src/modules/qimage/kdenlivetitle_wrapper.cpp
modified: src/modules/qimage/producer_kdenlivetitle.c
j-b-m [Sat, 25 Jul 2009 22:58:01 +0000 (00:58 +0200)]
Cleanup & fix crash
modified: kdenlivetitle_wrapper.cpp
modified: kdenlivetitle_wrapper.h
Dan Dennedy [Sun, 26 Jul 2009 17:54:36 +0000 (10:54 -0700)]
Fix handling of length parameter in mlt_playlist_remove_region.
This fixes kdenlive bug 1030.
The calls to mlt_playlist_split() inside this function appear to have forgotten that it splits _after_ the specified position.
Signed-off-by: Dan Dennedy <dan@dennedy.org>
j-b-m [Sat, 25 Jul 2009 22:58:01 +0000 (00:58 +0200)]
Cleanup & fix crash
modified: kdenlivetitle_wrapper.cpp
modified: kdenlivetitle_wrapper.h
j-b-m [Sat, 25 Jul 2009 07:28:16 +0000 (09:28 +0200)]
Fix bug preventing deletion of one frame region
modified: mlt_playlist.c
Marco Gittler [Fri, 24 Jul 2009 19:09:53 +0000 (21:09 +0200)]
Merge branch 'jbm-kdenlivetitle' into kdenlivetitle
j-b-m [Fri, 24 Jul 2009 14:15:32 +0000 (16:15 +0200)]
Fix mem leak
modified: src/modules/qimage/kdenlivetitle_wrapper.cpp
modified: src/modules/qimage/producer_kdenlivetitle.c
j-b-m [Fri, 24 Jul 2009 13:36:52 +0000 (15:36 +0200)]
Remove debug output
j-b-m [Fri, 24 Jul 2009 13:31:20 +0000 (15:31 +0200)]
Fix crash + position in time
modified: src/modules/qimage/kdenlivetitle_wrapper.cpp
modified: src/modules/qimage/kdenlivetitle_wrapper.h
modified: src/modules/qimage/producer_kdenlivetitle.c
j-b-m [Fri, 24 Jul 2009 12:46:53 +0000 (14:46 +0200)]
* Fix memleaks
* Cleanup
* Reload xml when setting "reload_xml" property
modified: src/modules/qimage/kdenlivetitle_wrapper.cpp
modified: src/modules/qimage/kdenlivetitle_wrapper.h
modified: src/modules/qimage/producer_kdenlivetitle.c
Marco Gittler [Fri, 24 Jul 2009 10:42:36 +0000 (12:42 +0200)]
kdenlivetitle_wrapper.cpp: use changed format of title-xml
Marco Gittler [Fri, 24 Jul 2009 09:39:39 +0000 (11:39 +0200)]
qimage_wrapper: removed unused line
Marco Gittler [Fri, 24 Jul 2009 09:39:03 +0000 (11:39 +0200)]
Merge branch 'jbm-kdenlivetitle' into kdenlivetitle
Conflicts:
src/modules/qimage/factory.c
src/modules/qimage/kdenlivetitle_wrapper.cpp
src/modules/qimage/kdenlivetitle_wrapper.h
src/modules/qimage/producer_kdenlivetitle.c
j-b-m [Fri, 24 Jul 2009 09:12:04 +0000 (11:12 +0200)]
Add feature to dynamically replace text in a block
modified: kdenlivetitle_wrapper.cpp
modified: kdenlivetitle_wrapper.h
modified: producer_kdenlivetitle.c
Marco Gittler [Fri, 24 Jul 2009 08:36:54 +0000 (10:36 +0200)]
qimage/factory.c: readded deleted qimage producer
Marco Gittler [Fri, 24 Jul 2009 08:33:21 +0000 (10:33 +0200)]
kdenlivetitle: reindent code / readded qimage_producer
Marco Gittler [Fri, 24 Jul 2009 08:28:13 +0000 (10:28 +0200)]
reindent c++
Marco Gittler [Fri, 24 Jul 2009 08:26:31 +0000 (10:26 +0200)]
reindent code
Marco Gittler [Fri, 24 Jul 2009 08:08:08 +0000 (10:08 +0200)]
readded deleted qimage producer in factory
Marco Gittler [Mon, 20 Jul 2009 10:16:13 +0000 (12:16 +0200)]
clean image before painting
Marco Gittler [Sun, 19 Jul 2009 19:11:20 +0000 (21:11 +0200)]
Merge branch 'master' of git://mltframework.org/mlt into kdenlivetitle
Dan Dennedy [Sun, 19 Jul 2009 18:40:58 +0000 (11:40 -0700)]
Fix image refresh in sdl_still consmuer.
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Dan Dennedy [Sun, 19 Jul 2009 18:40:13 +0000 (11:40 -0700)]
Avoid redefining _GNU_SOURCE.
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Marco Gittler [Sat, 18 Jul 2009 22:25:01 +0000 (00:25 +0200)]
kdenlivetitle: added QtXml during configure, add rescource to producer
Marco Gittler [Sat, 18 Jul 2009 12:33:06 +0000 (14:33 +0200)]
Merge branch 'master' of git://mltframework.org/mlt into kdenlivetitle
gmarco [Sat, 18 Jul 2009 11:51:15 +0000 (13:51 +0200)]
use start/end from kdenlive titlefiles
Marco Gittler [Sat, 18 Jul 2009 08:56:55 +0000 (10:56 +0200)]
working color conversion
Marco Gittler [Wed, 15 Jul 2009 16:40:51 +0000 (18:40 +0200)]
memcpy works now
Marco Gittler [Wed, 15 Jul 2009 14:16:38 +0000 (16:16 +0200)]
memhandling changed
Dan Dennedy [Tue, 14 Jul 2009 18:39:33 +0000 (11:39 -0700)]
Add missing include for basename().
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Marco Gittler [Tue, 14 Jul 2009 18:33:46 +0000 (20:33 +0200)]
Merge branch 'master' into kdenlivetitle
Dan Dennedy [Tue, 14 Jul 2009 18:21:02 +0000 (11:21 -0700)]
Fix build on OS X and possibly others.
Gives higher priority to local lib and include dirs than system or
SDL-based lib and include dirs. Also, moves previous -lm fix to
from general build to --avformat-svn and --avformat-static builds.
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Marco Gittler [Tue, 14 Jul 2009 17:38:45 +0000 (19:38 +0200)]
Merge branch 'master' into kdenlivetitle
Marco Gittler [Tue, 14 Jul 2009 17:25:56 +0000 (19:25 +0200)]
don't block under qt-application (kdenlive)
Marco Gittler [Tue, 14 Jul 2009 17:10:05 +0000 (19:10 +0200)]
cleanup
Marco Gittler [Tue, 14 Jul 2009 08:15:35 +0000 (10:15 +0200)]
test alpha channel
Dan Dennedy [Tue, 14 Jul 2009 03:19:03 +0000 (20:19 -0700)]
Fix underlinking avformat on some systems (bug
2821055 ).
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Dan Dennedy [Mon, 13 Jul 2009 17:45:38 +0000 (10:45 -0700)]
Apply sox 14.3 compatibility patch from Fathi Boudra.
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Marco Gittler [Fri, 10 Jul 2009 22:30:42 +0000 (00:30 +0200)]
kdenlivetitle_wrapper: interpolate from start-> end, added title to dict
Marco Gittler [Fri, 10 Jul 2009 21:03:16 +0000 (23:03 +0200)]
kdenlivetitle_wrapper: fixed typo, not seen in Mac OS (QtXml also needed
Marco Gittler [Fri, 10 Jul 2009 20:52:09 +0000 (22:52 +0200)]
kdenlivetitle_wrapper: load kdenlive titles
Marco Gittler [Fri, 10 Jul 2009 19:51:23 +0000 (21:51 +0200)]
kdenlivetitle_wrapper: use QApplication, else QGrahicsScene ist not
working
Marco Gittler [Fri, 10 Jul 2009 19:11:23 +0000 (21:11 +0200)]
kdenlivetitle_wrapper.{cpp,h}, producer_kdenlivetitle.c: LGPL header and
byte move for right RGBA values
Marco Gittler [Fri, 10 Jul 2009 17:04:25 +0000 (19:04 +0200)]
first work on kdenlive title producer
should later read the xml-file from kdenlive
and let the title have scroll and zoom
Dan Dennedy [Fri, 3 Jul 2009 21:55:15 +0000 (14:55 -0700)]
Massive refactoring of image conversion.
This drops all image color space and pixel format conversions from the
mlt_frame class. Instead, it adds a convert_image virtual function to
the mlt_frame class that is called within mlt_frame_get_image(). The
newly added imageconvert filter sets that virtual function and contains
the various conversion routines. The loader producer automatically
attaches this filter to the producer it creates.
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Dan Dennedy [Fri, 3 Jul 2009 21:50:14 +0000 (14:50 -0700)]
Slightly improve auto-setting MLT_NORMALISATION.
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Dan Dennedy [Tue, 30 Jun 2009 22:24:23 +0000 (15:24 -0700)]
Update ChangeLog for 0.4.4 release.
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Dan Dennedy [Tue, 30 Jun 2009 22:21:36 +0000 (15:21 -0700)]
Set to v0.4.4 and update release notes.
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Dan Dennedy [Tue, 30 Jun 2009 21:59:05 +0000 (14:59 -0700)]
Log failure to open audio.
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Dan Dennedy [Tue, 30 Jun 2009 02:14:53 +0000 (19:14 -0700)]
Fix crash with invalid video_driver property.
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Dan Dennedy [Tue, 30 Jun 2009 02:10:48 +0000 (19:10 -0700)]
Link gtk2 module against libiconv on FreeBSD.
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Dan Dennedy [Tue, 30 Jun 2009 01:53:20 +0000 (18:53 -0700)]
Resolve merge conflict.
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Dan Dennedy [Fri, 26 Jun 2009 21:12:49 +0000 (14:12 -0700)]
Fix conditional swig build and remove --enable-swig.
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Dan Dennedy [Tue, 23 Jun 2009 07:42:27 +0000 (00:42 -0700)]
Add SWIG Lua bindings.
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Dan Dennedy [Tue, 23 Jun 2009 06:45:56 +0000 (23:45 -0700)]
Further integrate swig into build system.
This is not enabled by default. It adds configure options --enable-swig
and --swig-languages.
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Dan Dennedy [Tue, 23 Jun 2009 04:45:16 +0000 (21:45 -0700)]
Add configure option --rename-melt.
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Dan Dennedy [Mon, 22 Jun 2009 21:31:27 +0000 (14:31 -0700)]
Fix crash in avformat producer on audio overrun.
Fixes Kdenlive bug 754 and possibly others due to unchecked bounds writing to
an audio buffer.
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Dan Dennedy [Mon, 22 Jun 2009 20:09:37 +0000 (13:09 -0700)]
Add blacklist to frei0r module.
This is for Kdenlive bugs 913 and 917. It is populated with only facedetect
for now.
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Dan Dennedy [Mon, 22 Jun 2009 20:01:50 +0000 (13:01 -0700)]
Merge branch 'master' of dennedy.org:git/mltframework.org/mlt
Dan Dennedy [Mon, 22 Jun 2009 20:00:02 +0000 (13:00 -0700)]
Initialize the environment before the module repo.
This lets module factory functions get info from mlt_environment().
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Dan Dennedy [Mon, 22 Jun 2009 03:39:21 +0000 (20:39 -0700)]
Remove these bogus make files in avformat.
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Dan Dennedy [Mon, 22 Jun 2009 02:08:34 +0000 (19:08 -0700)]
Fix avformat consumer crashing on pcm_s16le.
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Dan Dennedy [Sat, 20 Jun 2009 05:30:50 +0000 (22:30 -0700)]
Fix underlink libm gtk2 module (floor).
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Dan Dennedy [Sat, 20 Jun 2009 00:30:23 +0000 (17:30 -0700)]
Fix regression in 8bit audio handling.
Regression occurred with migration to FFmpeg av_audio_resample_init().
This also drops usage of non-public audio convert; instead, relying upon new
resample to do the same task. audioconvert.h is still used, however, to get
the sample format description.
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Dan Dennedy [Thu, 18 Jun 2009 22:40:20 +0000 (15:40 -0700)]
Fix underlinking libm for sdl module.
Patch from Debian.
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Dan Dennedy [Thu, 18 Jun 2009 22:38:27 +0000 (15:38 -0700)]
Fix manpage whatis entry.
Patch from Debian.
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Dan Dennedy [Thu, 18 Jun 2009 22:26:20 +0000 (15:26 -0700)]
Fix framebuffer producer to be thread-safe.
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Dan Dennedy [Wed, 17 Jun 2009 05:54:45 +0000 (22:54 -0700)]
Migrate to FFmpeg avformat_alloc_context().
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Dan Dennedy [Wed, 17 Jun 2009 05:33:13 +0000 (22:33 -0700)]
Migrate to FFmpeg av_audio_resample_init.
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Dan Dennedy [Wed, 17 Jun 2009 05:00:44 +0000 (22:00 -0700)]
Revert changes to melt in previous commit.
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Dan Dennedy [Wed, 17 Jun 2009 04:55:01 +0000 (21:55 -0700)]
Fix (kdenlive-824) >2 channels not downmixed.
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Dan Dennedy [Tue, 16 Jun 2009 17:10:52 +0000 (10:10 -0700)]
Fix underlinking jackrack plugin.
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Dan Dennedy [Tue, 16 Jun 2009 05:44:59 +0000 (22:44 -0700)]
Fix big memory leak in framebuffer producer.
This fix is for kdenlive bug 898. This was due to allocating a frame in
get_frame that might not get closed by a skipped call to get_image. This
skipping can happen when using realtime mode (frame dropping).
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Dan Dennedy [Tue, 16 Jun 2009 03:56:17 +0000 (20:56 -0700)]
Revert src/melt/Makefile in previous commit.
Signed-off-by: Dan Dennedy <dan@dennedy.org>
Dan Dennedy [Tue, 16 Jun 2009 03:44:30 +0000 (20:44 -0700)]
Add datadir and mandir options to configure.
Signed-off-by: Dan Dennedy <dan@dennedy.org>