X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Ffactory.c;h=54adf936d9026e1b41c6bc32b1e808d2920e23bd;hb=4fc3fa1bf4116848c423837437d75f103cdd0154;hp=7e4332c52005876191d755d4e4a8e7bc41c0dfd2;hpb=20e57e509a9849d166c4e3d9805746788a275ab7;p=melted

diff --git a/src/modules/avformat/factory.c b/src/modules/avformat/factory.c
index 7e4332c..54adf93 100644
--- a/src/modules/avformat/factory.c
+++ b/src/modules/avformat/factory.c
@@ -28,6 +28,7 @@ extern mlt_consumer consumer_avformat_init( mlt_profile profile, char *file );
 extern mlt_filter filter_avcolour_space_init( void *arg );
 extern mlt_filter filter_avdeinterlace_init( void *arg );
 extern mlt_filter filter_avresample_init( char *arg );
+extern mlt_filter filter_swscale_init( mlt_profile profile, char *arg );
 extern mlt_producer producer_avformat_init( mlt_profile profile, char *file );
 
 // ffmpeg Header files
@@ -89,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() );
 	}
 }
 
@@ -105,19 +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:
@@ -146,8 +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
 }