X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fcore%2Ffilter_watermark.c;h=51181d71eb76142c72489f1f995e48f378ab3cb8;hb=1f6faabf5ef11e6321d186772d88fb6958cdd057;hp=bfd491ee64f9225af40a3e52ec5e4d82b1f045b6;hpb=6ad443b3ffd53b2e8be119df6fb7d3f2da1c4cec;p=melted

diff --git a/src/modules/core/filter_watermark.c b/src/modules/core/filter_watermark.c
index bfd491e..51181d7 100644
--- a/src/modules/core/filter_watermark.c
+++ b/src/modules/core/filter_watermark.c
@@ -144,6 +144,12 @@ static int filter_get_image( mlt_frame frame, uint8_t **image, mlt_image_format
 			mlt_properties_set_double( b_props, "consumer_aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
 			mlt_properties_set_int( b_props, "consumer_deinterlace", mlt_properties_get_double( a_props, "consumer_deinterlace" ) );
 
+			// Check for the special case - no aspect ratio means no problem :-)
+			if ( mlt_frame_get_aspect_ratio( b_frame ) == 0 )
+				mlt_properties_set_double( b_props, "aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
+			if ( mlt_frame_get_aspect_ratio( frame ) == 0 )
+				mlt_properties_set_double( a_props, "aspect_ratio", mlt_properties_get_double( a_props, "consumer_aspect_ratio" ) );
+
 			mlt_properties_set_int( b_props, "normalised_width", mlt_properties_get_int( a_props, "normalised_width" ) );
 			mlt_properties_set_int( b_props, "normalised_height", mlt_properties_get_int( a_props, "normalised_height" ) );