From 051100a9b57a55ad7a3faacff7b15d4465ed634e Mon Sep 17 00:00:00 2001 From: Dan Dennedy Date: Sun, 27 Mar 2011 20:53:50 -0700 Subject: [PATCH] Fix regression in region filter (3251260). --- configure | 2 +- src/modules/core/transition_composite.c | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 06fb6fa0..bc2f69a2 100755 --- 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() diff --git a/src/modules/core/transition_composite.c b/src/modules/core/transition_composite.c index 811ee8d3..22eb091e 100644 --- a/src/modules/core/transition_composite.c +++ b/src/modules/core/transition_composite.c @@ -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; -- 2.39.2