From: j-b-m Date: Sun, 15 Mar 2009 18:55:05 +0000 (+0000) Subject: transition_composite.c: allow removing of luma file by passing an empty name X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=74895bda8eca2cd15017d4a3696bc4dd85183e4e;p=mlt transition_composite.c: allow removing of luma file by passing an empty name git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@1379 d19143bc-622f-0410-bfdd-b5b2a6649095 --- diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c index 3725c4a6..1f4ad894 100644 --- a/src/modules/core/transition_composite.c +++ b/src/modules/core/transition_composite.c @@ -648,6 +648,15 @@ static uint16_t* get_luma( mlt_transition this, mlt_properties properties, int w luma_bitmap = NULL; } } + else { + char *old_luma = mlt_properties_get( properties, "_luma" ); + if ( old_luma && old_luma[0] ) + { + mlt_properties_set_data( properties, "_luma.orig_bitmap", NULL, 0, NULL, NULL ); + luma_bitmap = NULL; + mlt_properties_set( properties, "_luma", NULL); + } + } if ( resource && resource[0] && ( luma_bitmap == NULL || luma_width != width || luma_height != height ) ) {