Preparation for Qt embedded support.

Makefile.opts.in

@@ -78,6 +78,7 @@ memcpyaltivec_CFLAGS = @memcpyaltivec_CFLAGS@
 motionaltivec_CFLAGS = @motionaltivec_CFLAGS@
 ts_dvbpsi_CFLAGS = @ts_dvbpsi_CFLAGS@
 qt_CFLAGS = @qt_CFLAGS@
+qte_CFLAGS = @qte_CFLAGS@
 sdl_CFLAGS = @sdl_CFLAGS@
 x11_CFLAGS = @x11_CFLAGS@
 xvideo_CFLAGS = @xvideo_CFLAGS@
@@ -127,6 +128,7 @@ ncurses_LDFLAGS = @ncurses_LDFLAGS@
 oss_LDFLAGS = @oss_LDFLAGS@
 qnx_LDFLAGS = @qnx_LDFLAGS@
 qt_LDFLAGS = @qt_LDFLAGS@
+qte_LDFLAGS = @qte_LDFLAGS@
 rc_LDFLAGS = @rc_LDFLAGS@
 sdl_LDFLAGS = @sdl_LDFLAGS@
 ts_dvbpsi_LDFLAGS = @ts_dvbpsi_LDFLAGS@

STATUS

-# $Id: STATUS,v 1.2 2002/07/22 13:48:13 jpsaman Exp $
+# $Id: STATUS,v 1.3 2002/08/10 11:35:30 jpsaman Exp $
 #
 #                              VLC STATUS
 #
@@ -59,3 +59,7 @@ Christophe Massiot <massiot@via.ecp.fr> :
 Jean-Paul Saman <jpsaman@wxs.nl> :
     - Familiar Linux interface for iPaq
       ETA : late summer
+
+Gerald Hansink <gerald.hansink@ordina.nl> :
+    - Video Out module for QT Embedded
+      ETA : end of 2002

configure.in

@@ -1640,6 +1640,24 @@ AC_ARG_ENABLE(kde,
      fi
    fi])
 
+dnl
+dnl  Qt embedded module
+dnl
+AC_ARG_ENABLE(qte,
+  [  --enable-qte            Qt embedded interface support (default disabled)],
+  [if test "x${enable_qte}" = "xyes"; then
+     PLUGINS="${PLUGINS} gui/qte/qte"
+     qte_LDFLAGS="${qte_LDFLAGS} -lqte -L${QTEDIR}/lib"
+     qte_CFLAGS="${qte_CFLAGS} -I/usr/include/qte -I${QTEDIR}/include"
+     if test -x ${QTEDIR}/bin/moc
+     then
+       MOC=${QTEDIR}/bin/moc
+     else
+       MOC=moc
+     fi
+   fi])
+
+
 dnl
 dnl  MacOS X module
 dnl
@@ -1971,6 +1989,7 @@ AC_SUBST(mad_CFLAGS)
 AC_SUBST(memcpyaltivec_CFLAGS)
 AC_SUBST(motionaltivec_CFLAGS)
 AC_SUBST(qt_CFLAGS)
+AC_SUBST(qte_CFLAGS)
 AC_SUBST(sdl_CFLAGS)
 AC_SUBST(x11_CFLAGS)
 AC_SUBST(xvideo_CFLAGS)
@@ -2018,6 +2037,7 @@ AC_SUBST(ncurses_LDFLAGS)
 AC_SUBST(oss_LDFLAGS)
 AC_SUBST(qnx_LDFLAGS)
 AC_SUBST(qt_LDFLAGS)
+AC_SUBST(qte_LDFLAGS)
 AC_SUBST(rc_LDFLAGS)
 AC_SUBST(sdl_LDFLAGS)
 AC_SUBST(vcd_LDFLAGS)

modules/codec/mad/decoder.c

@@ -165,7 +165,7 @@ static int InitThread( mad_adec_thread_t * p_mad_adec )
         msg_Dbg( p_fifo, "downscale default fast selected" );
     }
 
-		if (psz_downscale) free(psz_downscale);
+	if (psz_downscale) free(psz_downscale);
 
     /* Initialize the libmad decoder structures */
     p_mad_adec->libmad_decoder = (struct mad_decoder*) malloc(sizeof(struct mad_decoder));