]> git.sesse.net Git - mlt/commitdiff
fix regressions during refactorization
authorDan Dennedy <dan@dennedy.org>
Sat, 7 Apr 2012 17:54:57 +0000 (10:54 -0700)
committerDan Dennedy <dan@dennedy.org>
Sat, 7 Apr 2012 17:54:57 +0000 (10:54 -0700)
src/modules/plus/transition_affine.c
src/modules/qimage/qimage_wrapper.cpp

index 0ee92d3e63f3656e4ec2b1c9b17fa3dca6fa083f..f0eaaacb00214c01b3499ddef9f283d500a9d6bc 100644 (file)
@@ -175,7 +175,7 @@ static void affine_rotate_x( float affine[3][3], float angle )
        matrix[2][0] = 0;
        matrix[2][1] = 0;
        matrix[2][2] = 1;
-       affine_multiply( affine, affine );
+       affine_multiply( affine, matrix );
 }
 
 static void affine_rotate_y( float affine[3][3], float angle )
index 98c7f97bfd0bfd02c3226c5e5d9fcd5fb7a304d7..e7daef239a4808034b8c2c1fa73ad01395621edc 100644 (file)
@@ -320,8 +320,8 @@ void refresh_image( producer_qimage self, mlt_frame frame, mlt_image_format form
                self->image_cache = mlt_service_cache_get( MLT_PRODUCER_SERVICE( producer ), "qimage.image" );
                self->image_idx = image_idx;
                mlt_cache_item_close( self->alpha_cache );
-               mlt_service_cache_put( MLT_PRODUCER_SERVICE( producer ), "pixbuf.alpha", self->current_alpha, width * height, mlt_pool_release );
-               self->alpha_cache = mlt_service_cache_get( MLT_PRODUCER_SERVICE( producer ), "pixbuf.alpha" );
+               mlt_service_cache_put( MLT_PRODUCER_SERVICE( producer ), "qimage.alpha", self->current_alpha, width * height, mlt_pool_release );
+               self->alpha_cache = mlt_service_cache_get( MLT_PRODUCER_SERVICE( producer ), "qimage.alpha" );
        }
 
        // Set width/height of frame