sox fix; remove consumer avformat diagnostic

git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@303 d19143bc-622f-0410-bfdd-b5b2a6649095

diff --git a/src/modules/avformat/consumer_avformat.c b/src/modules/avformat/consumer_avformat.c
index d4782cbbe589d790f69b2517914d38cda9ebe85c..e4c2db50b2ba947af7db4bb8061d1984f7e17ff3 100644 (file)
--- a/src/modules/avformat/consumer_avformat.c
+++ b/src/modules/avformat/consumer_avformat.c
@@ -591,8 +591,6 @@ static void *consumer_thread( void *arg )
                if ( audio_st )
                        audio_input_frame_size = open_audio( oc, audio_st, audio_outbuf_size );
 
-               fprintf( stderr, "%d\n", audio_input_frame_size );
-
                // Open the output file, if needed
                if ( !( fmt->flags & AVFMT_NOFILE ) ) 
                {

diff --git a/src/modules/fezzik.ini b/src/modules/fezzik.ini
index 153f60d15d3559dde1d7d5193714efadc7f9cb31..554285c4a8b90e5f8e4c29310f1b163d641269cf 100644 (file)
--- a/src/modules/fezzik.ini
+++ b/src/modules/fezzik.ini
@@ -9,4 +9,4 @@
 deinterlace=avdeinterlace
 rescaler=mcrescale,gtkrescale,rescale
 resizer=resize
-resampler=soxresample,avresample
+resampler=soxresample,avresample,resample

diff --git a/src/modules/sox/Makefile b/src/modules/sox/Makefile
index 4fe0310c79fdd9bef5ba1485d08cab4386d5d27e..343a785dde348d36cf4ada29c73d2b4d9f0e961a 100644 (file)
--- a/src/modules/sox/Makefile
+++ b/src/modules/sox/Makefile
@@ -5,7 +5,7 @@ TARGET = ../libmltsox.so
 OBJS = factory.o \
           filter_sox.o 
 
-CFLAGS += -I../../
+CFLAGS += -I../../ -I/usr/include/sox
 
 LDFLAGS += -lst -lpopt -lvorbis -logg -lvorbisfile -lvorbisenc