--- fxtv_cnvt.sh.ORG	Sat Jul  5 22:26:14 2003
+++ fxtv_cnvt.sh	Mon Jul  7 22:34:49 2003
@@ -43,6 +43,7 @@
    PATH_FXTV="fxtv"
 fi
 PATH_SOX="sox"
+PATH_GOGO="gogo"
 PATH_MPEG_MUSICIN="mpeg_musicin"
 PATH_MPEG_ENCODE="mpeg_encode"
 PATH_MPLEX="mplex"
@@ -181,8 +182,13 @@
 
    # Do we need an intermediate file?
    if [ $mpeg_enc = YES ]; then
-      out_soxfn="$out_fnbase.aiff"
-      out_soxfmt="AIFF"
+      if [ $out_fmt = MPEG2 ]; then
+         out_soxfn="$out_fnbase.aiff"
+         out_soxfmt="AIFF"
+      else
+         out_soxfn="$out_fnbase.wav"
+         out_soxfmt="WAV"
+      fi
    else
       out_soxfn="$GAout_fn"
       out_soxfmt="$out_fmt"
@@ -202,7 +208,7 @@
       if [ $out_fmt = MPEG2 ]; then
          cmd="$cmd && $PATH_MPEG_MUSICIN -l 2 -p 1 $out_soxfn $GAout_fn"
       else
-         cmd="$cmd && $PATH_MPEG_MUSICIN -l 3 -p 2 $out_soxfn $GAout_fn"
+         cmd="$cmd && $PATH_GOGO $out_soxfn $GAout_fn"
       fi
       if [ $CLEANUP_TEMP_FILES = YES ]; then
          cmd="$cmd && rm $out_soxfn"
@@ -311,7 +317,7 @@
    in_fnmpa="$2"
    
    GXout_fnmps="$TARGET_FN_BASE.mps"
-   GXcmd="$PATH_MPLEX $in_fnmpg $in_fnmpa $GXout_fnmps"
+   GXcmd="$PATH_MPLEX -V $in_fnmpg $in_fnmpa $GXout_fnmps"
 }
 
 CountFrameFiles() {