]> git.sesse.net Git - mlt/commitdiff
Fix regression in region filter (3251260).
authorDan Dennedy <dan@dennedy.org>
Mon, 28 Mar 2011 03:53:50 +0000 (20:53 -0700)
committerDan Dennedy <dan@dennedy.org>
Mon, 28 Mar 2011 03:53:50 +0000 (20:53 -0700)
configure
src/modules/core/transition_composite.c

index 06fb6fa061e4f03896bdd1107478b3d60a22b5d0..bc2f69a21c78f48d70c8d20cdb69c763b52a62e9 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export version=0.7.0
+export version=0.7.1
 export soversion=4
 
 show_help()
index 811ee8d3f74c546c4c8f818b139dcb76906a3d21..22eb091e209674b18204f232ffb5b3fdb93ebac8 100644 (file)
@@ -982,10 +982,14 @@ mlt_frame composite_copy_region( mlt_transition this, mlt_frame a_frame, mlt_pos
        uint8_t *dest = NULL;
 
        // Get the image and dimensions
-       uint8_t *image = mlt_properties_get_data( a_props, "image", NULL );
+       uint8_t *image = NULL;
        int width = mlt_properties_get_int( a_props, "width" );
        int height = mlt_properties_get_int( a_props, "height" );
-       int format = mlt_properties_get_int( a_props, "format" );
+       mlt_image_format format = mlt_image_yuv422;
+
+       mlt_frame_get_image( a_frame, &image, &format, &width, &height, 0 );
+       if ( !image )
+               return b_frame;
 
        // Pointers for copy operation
        uint8_t *p;