Constness changes

[melted] / src / modules / avformat / factory.c

diff --git a/src/modules/avformat/factory.c b/src/modules/avformat/factory.c
index 0952a95..54adf93 100644 (file)
--- a/src/modules/avformat/factory.c
+++ b/src/modules/avformat/factory.c
@@ -90,7 +90,7 @@ static void avformat_init( )
                pthread_mutex_init( &avformat_mutex, NULL );
                av_register_all( );
                mlt_factory_register_for_clean_up( NULL, avformat_destroy );
-               av_log_set_level( -1 );
+               av_log_set_level( mlt_log_get_level() );
        }
 }
 
@@ -106,21 +106,25 @@ static void *create_service( mlt_profile profile, mlt_service_type type, const c
                        return consumer_avformat_init( profile, arg );
        }
 #endif
+#ifdef FILTERS
        if ( !strcmp( id, "avcolour_space" ) )
                return filter_avcolour_space_init( arg );
        if ( !strcmp( id, "avdeinterlace" ) )
                return filter_avdeinterlace_init( arg );
        if ( !strcmp( id, "avresample" ) )
                return filter_avresample_init( arg );
+#ifdef SWSCALE
        if ( !strcmp( id, "swscale" ) )
                return filter_swscale_init( profile, arg );
+#endif
+#endif
        return NULL;
 }
 
 static mlt_properties avformat_metadata( mlt_service_type type, const char *id, void *data )
 {
        char file[ PATH_MAX ];
-       char *service_type = NULL;
+       const char *service_type = NULL;
        switch ( type )
        {
                case consumer_type:
@@ -149,9 +153,13 @@ MLT_REPOSITORY
        MLT_REGISTER( producer_type, "avformat", create_service );
        MLT_REGISTER_METADATA( producer_type, "avformat", avformat_metadata, NULL );
 #endif
+#ifdef FILTERS
        MLT_REGISTER( filter_type, "avcolour_space", create_service );
        MLT_REGISTER( filter_type, "avcolor_space", create_service );
        MLT_REGISTER( filter_type, "avdeinterlace", create_service );
        MLT_REGISTER( filter_type, "avresample", create_service );
+#ifdef SWSCALE
        MLT_REGISTER( filter_type, "swscale", create_service );
+#endif
+#endif
 }