configure

+ Correction to ldflags for Darwin

src/modules/avformat/Makefile
src/modules/avformat/configure
+ Correction for avformat on Darwin

src/modules/sdl/consumer_sdl.c
src/modules/sdl/consumer_sdl_preview.c
src/modules/sdl/consumer_sdl_still.c
+ Forgot to create the surface on the start (doh)

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

diff --git a/configure b/configure
index 9808ff3..68e490e 100755 (executable)
--- a/configure
+++ b/configure
@@ -60,7 +60,7 @@ function build_config
                Darwin)
                echo "CFLAGS+=-D__DARWIN__ `sdl-config --cflags`"
                echo "SHFLAGS=-dynamiclib"
-               echo "LIBDL=`sdl-config --libs`"
+               echo "LDFLAGS+=`sdl-config --libs`"
                ;;
                Linux)
                echo "CFLAGS+=-pthread"

diff --git a/src/modules/avformat/Makefile b/src/modules/avformat/Makefile
index cc4b1d7..ce4259c 100644 (file)
--- a/src/modules/avformat/Makefile
+++ b/src/modules/avformat/Makefile
@@ -17,7 +17,7 @@ CFLAGS+=-I../..
 
 LDFLAGS+=-L../../framework
 
-LDFLAGS+=-lavformat$(AVFORMAT_SUFFIX) -lavcodec$(AVFORMAT_SUFFIX) $(EXTRA_LIBS) -lmlt
+LDFLAGS+=-lavformat$(AVFORMAT_SUFFIX) -lavcodec$(AVFORMAT_SUFFIX) -lavutil$(AVFORMAT_SUFFIX) $(EXTRA_LIBS) -lmlt
 
 SRCS := $(OBJS:.o=.c)
 

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index 24315e9..ce10ddf 100755 (executable)
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -30,7 +30,7 @@ else
        echo > config.mak
 
        export static_ffmpeg=
-       export shared_ffmpeg=`whereis ffmpeg | cut -f 2 -d' '`
+       export shared_ffmpeg=`which ffmpeg`
        export extra_libs=
        export cvs_ffmpeg=
        export avformat_suffix=
@@ -72,8 +72,8 @@ else
        then 
                if [ -d "$static_ffmpeg" ]
                then
-                       echo "CFLAGS+=-I$static_ffmpeg/libavformat -I$static_ffmpeg/libavcodec" >> config.mak
-                       echo "LDFLAGS+=-L$static_ffmpeg/libavformat -L$static_ffmpeg/libavcodec" >> config.mak
+                       echo "CFLAGS+=-I$static_ffmpeg/libavformat -I$static_ffmpeg/libavcodec -I$static_ffmpeg/libavutil" >> config.mak
+                       echo "LDFLAGS+=-L$static_ffmpeg/libavformat -L$static_ffmpeg/libavcodec -L$static_ffmpeg/libavutil" >> config.mak
                        [ $targetos = "Darwin" ] &&
                                echo "LDFLAGS+=-single_module" >> config.mak
                else
@@ -82,7 +82,7 @@ else
                        echo 0
                fi
        else 
-               if [ -d "$shared_ffmpeg/include/ffmpeg" -a -f "$shared_ffmpeg/lib/libavformat.so" ]
+               if [ -d "$shared_ffmpeg/include/ffmpeg" -a -f "$shared_ffmpeg/lib/libavformat$LIBSUF" ]
                then
                        echo "CFLAGS+=-I$shared_ffmpeg/include/ffmpeg " >> config.mak
                        echo "LDFLAGS+=-L$shared_ffmpeg/lib" >> config.mak

diff --git a/src/modules/sdl/consumer_sdl.c b/src/modules/sdl/consumer_sdl.c
index 378a78b..46a6e16 100644 (file)
--- a/src/modules/sdl/consumer_sdl.c
+++ b/src/modules/sdl/consumer_sdl.c
@@ -205,6 +205,8 @@ int consumer_start( mlt_consumer parent )
                if ( !mlt_properties_get_int( MLT_CONSUMER_PROPERTIES( parent ), "audio_off" ) )
                        SDL_InitSubSystem( SDL_INIT_AUDIO );
 
+               this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags );
+
                pthread_create( &this->thread, NULL, consumer_thread, this );
        }
 

diff --git a/src/modules/sdl/consumer_sdl_preview.c b/src/modules/sdl/consumer_sdl_preview.c
index fc04af9..6302512 100644 (file)
--- a/src/modules/sdl/consumer_sdl_preview.c
+++ b/src/modules/sdl/consumer_sdl_preview.c
@@ -160,6 +160,8 @@ static int consumer_start( mlt_consumer parent )
                SDL_EnableKeyRepeat( SDL_DEFAULT_REPEAT_DELAY, SDL_DEFAULT_REPEAT_INTERVAL );
                SDL_EnableUNICODE( 1 );
 
+               mlt_consumer_start( this->still );
+
                pthread_create( &this->thread, NULL, consumer_thread, this );
        }
 

diff --git a/src/modules/sdl/consumer_sdl_still.c b/src/modules/sdl/consumer_sdl_still.c
index ad83aa4..b5fc4f3 100644 (file)
--- a/src/modules/sdl/consumer_sdl_still.c
+++ b/src/modules/sdl/consumer_sdl_still.c
@@ -197,6 +197,8 @@ static int consumer_start( mlt_consumer parent )
                        }
                }
 
+               this->sdl_screen = SDL_SetVideoMode( this->window_width, this->window_height, 0, this->sdl_flags );
+
                pthread_create( &this->thread, NULL, consumer_thread, this );
        }