fix regression with adding image conversion to image producers

diff --git a/src/modules/gtk2/producer_pixbuf.c b/src/modules/gtk2/producer_pixbuf.c
index 2566590bd3c5ab22f83c7de667596f2d0cf24d84..493c79308137aed4a8f12fbc40237c751e613acc 100644 (file)
--- a/src/modules/gtk2/producer_pixbuf.c
+++ b/src/modules/gtk2/producer_pixbuf.c
@@ -407,10 +407,8 @@ static void refresh_image( producer_pixbuf self, mlt_frame frame, mlt_image_form
                        uint8_t *buffer = NULL;
 
                        // First, set the image so it can be converted when we get it
+                       mlt_frame_replace_image( frame, self->image, self->format, width, height );
                        mlt_frame_set_image( frame, self->image, image_size, mlt_pool_release );
-                       mlt_properties_set_int( properties, "format", self->format );
-                       mlt_properties_set_int( properties, "width", width );
-                       mlt_properties_set_int( properties, "height", height );
                        self->format = format;
 
                        // get_image will do the format conversion

diff --git a/src/modules/qimage/qimage_wrapper.cpp b/src/modules/qimage/qimage_wrapper.cpp
index 4877af8eb3c883999ce2ba782ca58d919e88d1bc..5345ab2e22fdfa0ea8f537361ddb23f7d7978c75 100644 (file)
--- a/src/modules/qimage/qimage_wrapper.cpp
+++ b/src/modules/qimage/qimage_wrapper.cpp
@@ -295,10 +295,8 @@ void refresh_image( producer_qimage self, mlt_frame frame, mlt_image_format form
                        uint8_t *buffer = NULL;
 
                        // First, set the image so it can be converted when we get it
+                       mlt_frame_replace_image( frame, self->current_image, self->format, width, height );
                        mlt_frame_set_image( frame, self->current_image, image_size, mlt_pool_release );
-                       mlt_properties_set_int( properties, "format", self->format );
-                       mlt_properties_set_int( properties, "width", width );
-                       mlt_properties_set_int( properties, "height", height );
                        self->format = format;
 
                        // get_image will do the format conversion