X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Fsox%2Ffilter_sox.c;h=66cc54d3c50e2817b49ba8190fce1fb75ffc588d;hb=f4d4669b66a9f23be85527f65dec19a566db561c;hp=561fa657e96883b043de4916cbd8262cedb811f1;hpb=ee550b8c693729b1a6cb216de578446785612777;p=melted

diff --git a/src/modules/sox/filter_sox.c b/src/modules/sox/filter_sox.c
index 561fa65..66cc54d 100644
--- a/src/modules/sox/filter_sox.c
+++ b/src/modules/sox/filter_sox.c
@@ -35,16 +35,20 @@
 #	define ST_SUCCESS SOX_SUCCESS
 #	define st_sample_t sox_sample_t
 #	define eff_t sox_effect_t*
-#	define st_size_t sox_size_t
 #	define ST_LIB_VERSION_CODE SOX_LIB_VERSION_CODE
 #	define ST_LIB_VERSION SOX_LIB_VERSION
+#	if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,2,0))
+#		define st_size_t size_t
+#	else
+#		define st_size_t sox_size_t
+#	endif
 #	define ST_SIGNED_WORD_TO_SAMPLE(d,clips) SOX_SIGNED_16BIT_TO_SAMPLE(d,clips)
-#if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,1,0))
-#	define ST_SSIZE_MIN SOX_SAMPLE_MIN
-#else
-#	define ST_SSIZE_MIN SOX_SSIZE_MIN
-#endif
-#	define ST_SAMPLE_TO_SIGNED_WORD(d,clips) SOX_SAMPLE_TO_SIGNED_16BIT(d,clips)
+#	if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,1,0))
+#		define ST_SSIZE_MIN SOX_SAMPLE_MIN
+#	else
+#		define ST_SSIZE_MIN SOX_SSIZE_MIN
+#	endif
+#		define ST_SAMPLE_TO_SIGNED_WORD(d,clips) SOX_SAMPLE_TO_SIGNED_16BIT(d,clips)
 #else
 #	include <st.h>
 #endif
@@ -102,7 +106,9 @@ static int create_effect( mlt_filter this, char *value, int count, int channel,
 #ifdef SOX14
 	//fprintf(stderr, "%s: effect %s count %d\n", __FUNCTION__, tokeniser->tokens[0], tokeniser->count );
 #if (ST_LIB_VERSION_CODE >= ST_LIB_VERSION(14,1,0))
-	eff_t eff = sox_create_effect( sox_find_effect( tokeniser->tokens[0] ) );
+	sox_effect_handler_t const *eff_handle = sox_find_effect( tokeniser->tokens[0] );
+	if (eff_handle == NULL ) return error;
+	eff_t eff = sox_create_effect( eff_handle );
 	effect_destructor = ( mlt_destructor ) delete_effect;
 	sox_encodinginfo_t *enc = calloc( 1, sizeof( sox_encodinginfo_t ) );
 	enc->encoding = SOX_ENCODING_SIGN2;