+ And a fix for the PPC darwin

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

diff --git a/src/modules/qimage/Makefile b/src/modules/qimage/Makefile
index 742d95190d1f58d65dac056da97d84bb1641c872..44ad0d6ca67aecf79456579ec3df9748c1df2276 100644 (file)
--- a/src/modules/qimage/Makefile
+++ b/src/modules/qimage/Makefile
@@ -1,12 +1,12 @@
 include ../../../config.mak
 include config.mak
 
-TARGET=../libmltqimage.so
+TARGET=../libmltqimage$(LIBSUF)
 
 OBJS=factory.o producer_qimage.o
 CPPOBJS=qimage_wrapper.o
 CFLAGS+=-I../../
-LDFLAGS+=-L../../framework $(QTLIBS) -lmlt -lstdc++
+LDFLAGS=-L../../framework $(QTLIBS) -lmlt -lstdc++
 CXXFLAGS+=$(CFLAGS) $(QTCXXFLAGS) -Wno-deprecated
 
 SRCS := $(OBJS:.o=.c) $(CPPOBJS:.o=.cpp)
@@ -14,7 +14,7 @@ SRCS := $(OBJS:.o=.c) $(CPPOBJS:.o=.cpp)
 all:   $(TARGET)
 
 $(TARGET): $(OBJS) $(CPPOBJS)
-               $(CC) -shared -o $@ $(OBJS) $(CPPOBJS) $(LDFLAGS)
+               $(CC) $(SHFLAGS) -o $@ $(OBJS) $(CPPOBJS) $(LDFLAGS)
 
 depend:        $(SRCS)
                $(CC) -MM $(CFLAGS) $(QTCXXFLAGS) $^ 1>.depend

diff --git a/src/modules/qimage/configure b/src/modules/qimage/configure
index 9f80fb3c9be5d8ba269593b7455f58ffe599e4b8..586a36c71183644d03fca65d92ce5e6f4d1eca04 100755 (executable)
--- a/src/modules/qimage/configure
+++ b/src/modules/qimage/configure
@@ -41,7 +41,7 @@ else
        if [ -d "$qimage_libdir" -a -d "$qimage_includedir" ]
        then
                echo QTCXXFLAGS=-I$qimage_includedir > config.mak
-               echo QTLIBS=-lqt-mt >> config.mak
+               echo QTLIBS=-L$qimage_libdir/lib -lqt-mt >> config.mak
                echo qimage             libmltqimage$LIBSUF >> ../producers.dat
        else
                echo "qimage: QT environment not found - disabling"

diff --git a/src/modules/qimage/qimage_wrapper.cpp b/src/modules/qimage/qimage_wrapper.cpp
index c07883629e93abd3126b1df4cf13d5fef38b3573..cc88272380bbdf68e64c7aa640c80adffd210f47 100644 (file)
--- a/src/modules/qimage/qimage_wrapper.cpp
+++ b/src/modules/qimage/qimage_wrapper.cpp
@@ -153,7 +153,10 @@ void refresh_qimage( mlt_frame frame, int width, int height )
                current_alpha = ( uint8_t * )mlt_pool_alloc( current_width * current_height );
 
                // Convert the image
-               mlt_convert_bgr24a_to_yuv422( temp.bits( ), current_width, current_height, temp.bytesPerLine( ), current_image, current_alpha );
+               if ( QImage::systemBitOrder( ) == QImage::BigEndian )
+                       mlt_convert_argb_to_yuv422( temp.bits( ), current_width, current_height, temp.bytesPerLine( ), current_image, current_alpha );
+               else
+                       mlt_convert_bgr24a_to_yuv422( temp.bits( ), current_width, current_height, temp.bytesPerLine( ), current_image, current_alpha );
 
                assign_buffered_image( producer_props, current_image, current_alpha, current_width, current_height );
        }