X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Ffilter_avcolour_space.c;h=247f6e5970ebb18f7872a8a3dc482229725b11a4;hb=cdf7162ebc07120e92166a0e43eaba21ecca25ba;hp=77fd029c6d31f140011cb30b8bac96449320a512;hpb=3e021eb2f553fada306bc4879fabda445e75450d;p=melted

diff --git a/src/modules/avformat/filter_avcolour_space.c b/src/modules/avformat/filter_avcolour_space.c
index 77fd029..247f6e5 100644
--- a/src/modules/avformat/filter_avcolour_space.c
+++ b/src/modules/avformat/filter_avcolour_space.c
@@ -115,9 +115,9 @@ static inline void convert_image( uint8_t *out, uint8_t *in, int out_fmt, int in
 static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *format, int *width, int *height, int writable )
 {
 	mlt_filter filter = mlt_frame_pop_service( this );
-	mlt_properties properties = mlt_frame_properties( this );
+	mlt_properties properties = MLT_FRAME_PROPERTIES( this );
 	int output_format = *format;
-	mlt_image_format forced = mlt_properties_get_int( mlt_filter_properties( filter ), "forced" );
+	mlt_image_format forced = mlt_properties_get_int( MLT_FILTER_PROPERTIES( filter ), "forced" );
 	int error = 0;
 
 	// Allow this filter to force processing in a colour space other than requested
@@ -125,7 +125,7 @@ static int filter_get_image( mlt_frame this, uint8_t **image, mlt_image_format *
    
 	error = mlt_frame_get_image( this, image, format, width, height, 0 );
 
-	if ( error == 0 && *format != output_format )
+	if ( error == 0 && *format != output_format && *image != NULL )
 	{
 		int in_fmt = convert_mlt_to_av_cs( *format );
 		int out_fmt = convert_mlt_to_av_cs( output_format );