Let loader producer use new GLSL normalizing filters (opengl branch).

[mlt] / src / modules / avformat / filter_avcolour_space.c

diff --git a/src/modules/avformat/filter_avcolour_space.c b/src/modules/avformat/filter_avcolour_space.c
index 5bf53ea415d1d993a722aa78c6c0c5c1a28c931d..9b5cfbc87ca460b2c6910306931fd6c96d3bf3b4 100644 (file)
--- a/src/modules/avformat/filter_avcolour_space.c
+++ b/src/modules/avformat/filter_avcolour_space.c
@@ -65,7 +65,7 @@ static int convert_mlt_to_av_cs( mlt_image_format format )
                case mlt_image_yuv420p:
                        value = PIX_FMT_YUV420P;
                        break;
-               case mlt_image_none:
+               default:
                        mlt_log_error( NULL, "[filter avcolor_space] Invalid format\n" );
                        break;
        }
@@ -303,8 +303,9 @@ static mlt_frame filter_process( mlt_filter filter, mlt_frame frame )
        if ( mlt_properties_get_int( properties, "colorspace" ) <= 0 )
                mlt_properties_set_int( properties, "colorspace", mlt_service_profile( MLT_FILTER_SERVICE(filter) )->colorspace );
 
-       frame->convert_image = convert_image;
-    
+       if ( !frame->convert_image )
+               frame->convert_image = convert_image;
+
 //     Not working yet - see comment for get_image() above.
 //     mlt_frame_push_service( frame, mlt_service_profile( MLT_FILTER_SERVICE( filter ) ) );
 //     mlt_frame_push_get_image( frame, get_image );