Improve swig build with help from Michael Forney.

Restore performance characteristics of recent composite fix.

Fix composite regression with no luma.

Merge branch 'mlt_framebuffer' of git://github.com/j-b-m/mlt

Fix abruptness when using a luma with softness in composite.

Fix big memory leak when scrubbing.

Fix memleaks
modified:   src/modules/kdenlive/producer_framebuffer.c

Fix framebuffer flicker
modified:   src/modules/kdenlive/producer_framebuffer.c

Merge branch 'master' of git://mltframework.org/mlt

Merge branch 'master' of dennedy.org:git/mltframework.org/mlt

Cleanup pthread mutexes and conditions.

Fix core scaler regression.

Signed-off-by: Dan Dennedy <dan@dennedy.org>

Merge branch 'master' of xtremedia:git/mltframework.org/mlt

Patch from Michael Forney to fix swig configure.

If configure is run with --swig-languages="lang1 lang2", it complains
because it is compared to "all" without any quotes.

Signed-off-by: Dan Dennedy <dan@dennedy.org>

Fix making paths relative (kdenlive-1111).

Signed-off-by: Dan Dennedy <dan@dennedy.org>

Merge commit 'jbm/kdenlivetitle' into kdenlivetitle

Conflicts:
src/modules/qimage/kdenlivetitle_wrapper.cpp

Don't crash when running kdenlivetitle module from a console,
instead print error message and exit
modified:   src/modules/qimage/kdenlivetitle_wrapper.cpp

Revert "Fix bug preventing removal of one frame region"

This reverts commit 0848780c9c97c2aca435b954e762f7915598d970.

modified:   src/framework/mlt_playlist.c

Merge branch 'master' of git://mltframework.org/mlt

Fix flicker frame appearing at 0 position, small optimisations
modified:   src/modules/qimage/kdenlivetitle_wrapper.cpp

Fix flicker frame appearing at 0 position, small optimisations
modified:   src/modules/qimage/kdenlivetitle_wrapper.cpp

Merge branch 'master' of git://mltframework.org/mlt into kdenlivetitle

The padding is no longer necessary with the gcc aligned attribute.

Signed-off-by: Dan Dennedy <dan@dennedy.org>

Chris Rudorff (ppc contributor) strongly suggests 16 byte alignment and padding for all arch.

Signed-off-by: Dan Dennedy <dan@dennedy.org>

Apply JBM's fix to framebuffer regression on big image convert refactoring.

Signed-off-by: Dan Dennedy <dan@dennedy.org>

Apply mem alignment and corruption patches from Christoph Rudorff while debugging ppc.

Signed-off-by: Dan Dennedy <dan@dennedy.org>

Merge branch 'master' of git://mltframework.org/mlt into kdenlivetitle

Merge branch 'kdenlivetitle' of github.com:gmarco/mlt into kdenlivetitle

removed warning

Merge branch 'master' into kdenlivetitle

Convert audio-only SDL consumer to new audio API.

Signed-off-by: Dan Dennedy <dan@dennedy.org>

Cleanup indentation

Signed-off-by: Dan Dennedy <dan@dennedy.org>

Add audio-only SDL consumer (for Kdenlive on OS X).

Signed-off-by: Dan Dennedy <dan@dennedy.org>

Fix A/V sync regression introduced in commit f6916f

Signed-off-by: Dan Dennedy <dan@dennedy.org>

Merge branch 'master' of git://mltframework.org/mlt into kdenlivetitle

Convert audio-only SDL consumer to new audio API.

Signed-off-by: Dan Dennedy <dan@dennedy.org>

Cleanup indentation

Signed-off-by: Dan Dennedy <dan@dennedy.org>

Add audio-only SDL consumer (for Kdenlive on OS X).

Signed-off-by: Dan Dennedy <dan@dennedy.org>

Merge branch 'master' of git://mltframework.org/mlt into kdenlivetitle

Fix A/V sync regression introduced in commit f6916f

Signed-off-by: Dan Dennedy <dan@dennedy.org>

Merge branch 'master' of git://mltframework.org/mlt into kdenlivetitle

Add Linsys SDI consumer from B.C.E.

Signed-off-by: Dan Dennedy <dan@dennedy.org>

Fix a/v sync on files with incorrect codec frame rate, but correct muxer rate.

Signed-off-by: Dan Dennedy <dan@dennedy.org>

Titler: add support for background property
modified:   src/modules/qimage/kdenlivetitle_wrapper.cpp

Titler: add support for background property
modified:   src/modules/qimage/kdenlivetitle_wrapper.cpp

Merge branch 'master' of git://mltframework.org/mlt

Fix a/v synch drift with some unhandled framerates (kdenlive-1034).

Previously only special handling provided for 32000, 44100, and 48000
sample rates on the strange NTSC frame rate. Patch provided by Mike
Adkins makes it generic including 24000/1001. Thanks!

Signed-off-by: Dan Dennedy <dan@dennedy.org>

Refactor audio conversion and mixing.

Signed-off-by: Dan Dennedy <dan@dennedy.org>

Fix some SDL concurrency issues I am seeing in Kdenlive on my quad core.

Signed-off-by: Dan Dennedy <dan@dennedy.org>

Merge commit 'jbm/kdenlivetitle' into kdenlivetitle

Fix regression introduced by last commit
modified:   kdenlivetitle_wrapper.cpp

Merge commit 'jbm/kdenlivetitle' into kdenlivetitle

Fix start / endviewport movement, do not respect aspect ratio when resizing
modified:   kdenlivetitle_wrapper.cpp

Merge commit 'jbm/kdenlivetitle' into kdenlivetitle

Add support for svg items in titles
modified:   configure
modified:   kdenlivetitle_wrapper.cpp

Merge commit 'jbm/kdenlivetitle' into kdenlivetitle

Dont's set Graphicscene parent to avoid warning message, fix display of images
modified:   kdenlivetitle_wrapper.cpp

remove unused var
modified:   kdenlivetitle_wrapper.h

Fix errors in caching + mem leaks, fix resize issue
modified:   kdenlivetitle_wrapper.cpp
modified:   kdenlivetitle_wrapper.h
modified:   producer_kdenlivetitle.c

Merge commit 'jbm/kdenlivetitle' into kdenlivetitle

Rewrote caching, similar to qimage producer
modified:   kdenlivetitle_wrapper.cpp
modified:   kdenlivetitle_wrapper.h
modified:   producer_kdenlivetitle.c

Cache image if there is no animation
modified:   kdenlivetitle_wrapper.cpp

Merge commit 'jbm/kdenlivetitle' into kdenlivetitle

Use QImage instead of QPixmap, add myself in copyright
modified:   kdenlivetitle_wrapper.cpp
modified:   kdenlivetitle_wrapper.h
modified:   producer_kdenlivetitle.c

kdenlivetitle_wrapper.cpp: qt 4.4 fix for scale

Merge commit 'jbm/kdenlivetitle' into kdenlivetitle

don't use cache, just normal properties to store scene
modified:   kdenlivetitle_wrapper.cpp
modified:   kdenlivetitle_wrapper.h

Rescale title when they are played with a different profile
modified:   kdenlivetitle_wrapper.cpp
modified:   kdenlivetitle_wrapper.h
modified:   producer_kdenlivetitle.c

Merge commit 'jbm/kdenlivetitle' into kdenlivetitle

Fix image size, fix utf-8 characters in titles
modified:   kdenlivetitle_wrapper.cpp
modified:   producer_kdenlivetitle.c

Merge commit 'jbm/kdenlivetitle' into kdenlivetitle

Fix use of several title producers in one instance of Kdenlive
modified:   kdenlivetitle_wrapper.cpp
modified:   kdenlivetitle_wrapper.h
modified:   producer_kdenlivetitle.c

Revert "Fix bug preventing deletion of one frame region"

This reverts commit 17611c672d6a81b3f1b4b445a83606b087603ceb.

Signed-off-by: Dan Dennedy <dan@dennedy.org>

kdenlivetitle_wrapper.cpp: fixed merge conflict

Merge commit 'jbm/kdenlivetitle' into kdenlivetitle

debug --
modified:   producer_kdenlivetitle.c

Cleanup + fix crashes when used in Kdenlive
modified:   kdenlivetitle_wrapper.cpp
modified:   kdenlivetitle_wrapper.h
modified:   producer_kdenlivetitle.c

Merge branch 'master' into kdenlivetitle

Fix mem leak
modified:   src/modules/qimage/kdenlivetitle_wrapper.cpp
modified:   src/modules/qimage/producer_kdenlivetitle.c

Cleanup & fix crash
modified:   kdenlivetitle_wrapper.cpp
modified:   kdenlivetitle_wrapper.h

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>

Cleanup & fix crash
modified:   kdenlivetitle_wrapper.cpp
modified:   kdenlivetitle_wrapper.h

Fix bug preventing removal of one frame region
modified:   mlt_playlist.c

Fix bug preventing deletion of one frame region
modified:   mlt_playlist.c

Merge branch 'jbm-kdenlivetitle' into kdenlivetitle

Fix mem leak
modified:   src/modules/qimage/kdenlivetitle_wrapper.cpp
modified:   src/modules/qimage/producer_kdenlivetitle.c

Remove debug output

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

* 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

kdenlivetitle_wrapper.cpp: use changed format of title-xml

qimage_wrapper: removed unused line

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

Add feature to dynamically replace text in a block
modified:   kdenlivetitle_wrapper.cpp
modified:   kdenlivetitle_wrapper.h
modified:   producer_kdenlivetitle.c

qimage/factory.c: readded deleted qimage producer

kdenlivetitle: reindent code / readded qimage_producer

reindent c++

reindent code

readded deleted qimage producer in factory

clean image before painting

Merge branch 'master' of git://mltframework.org/mlt into kdenlivetitle