From 36493085be1aa428d2b207ebad20d3914bdcece8 Mon Sep 17 00:00:00 2001 From: ddennedy Date: Mon, 17 Nov 2008 02:08:56 +0000 Subject: [PATCH] filter_sox.c: bugfix (2263114) build on sox 14.2.0. git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@1239 d19143bc-622f-0410-bfdd-b5b2a6649095 --- src/modules/sox/filter_sox.c | 18 +++++++++++------- 1 files changed, 11 insertions(+), 7 deletions(-) diff --git a/src/modules/sox/filter_sox.c b/src/modules/sox/filter_sox.c index 561fa65..42bf812 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 #endif -- 1.7.4.4