From: Dan Dennedy <dan@dennedy.org>
Date: Sat, 21 Dec 2013 19:15:55 +0000 (-0800)
Subject: Fix bug passing serializable data property (SF-202).
X-Git-Url: https://git.sesse.net/?a=commitdiff_plain;h=0ae409f22585354b2b8c2459a3cb9e6d39e42dfe;hp=9a19d7b3ccc4af7cb37bb958eefd4f421c51a04d;p=mlt

Fix bug passing serializable data property (SF-202).

Patch by Jakub Ksiezniak.
---

diff --git a/src/framework/mlt_property.c b/src/framework/mlt_property.c
index 8339c81b..64e05924 100644
--- a/src/framework/mlt_property.c
+++ b/src/framework/mlt_property.c
@@ -774,10 +774,10 @@ void mlt_property_pass( mlt_property self, mlt_property that )
 		self->destructor = free;
 		self->serialiser = that->serialiser;
 	}
-	else if ( self->types & mlt_prop_data && self->serialiser != NULL )
+	else if ( self->types & mlt_prop_data && that->serialiser != NULL )
 	{
 		self->types = mlt_prop_string;
-		self->prop_string = self->serialiser( self->data, self->length );
+		self->prop_string = that->serialiser( that->data, that->length );
 	}
 	pthread_mutex_unlock( &self->mutex );
 }