[Mplayer-cvslog] CVS: main/TOOLS mencvcd,1.12,1.13

[Sascha Sommer CVS]

Update of /cvsroot/mplayer/main/TOOLS
In directory mail:/var/tmp.root/cvs-serv18295

Modified Files:
	mencvcd 
Log Message:
10l

Index: mencvcd
===================================================================
RCS file: /cvsroot/mplayer/main/TOOLS/mencvcd,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- mencvcd	30 May 2003 17:37:33 -0000	1.12
+++ mencvcd	3 Jun 2003 18:48:03 -0000	1.13
@@ -209,7 +209,7 @@
 vbr=1152
 vbrset=0
 denoise="cat -"
-norm="VCD"
+vnorm="VCD"
 mplexnorm="-f $VCDMODE -m 1 -V -b 46"
 imaget="-t vcd2"
 yuvin=""
@@ -304,7 +304,7 @@
         shift 1
         ;;
       -svcdout)
-        norm="SVCD"
+        vnorm="SVCD"
 	;;
       -sync)
         sync="-O $2"
@@ -330,7 +330,7 @@
 
 # some configs
 mpegnorm="-f $VCDMODE -b $vbr -B 260 -V 46"
-if [ "$norm" == "SVCD" ]; then
+if [ "$vnorm" == "SVCD" ]; then
    [ $vbrset -eq 0 ] && vbr=2500
    mplexnorm="-f $SVCDMODE -m 2 -V -b 230"
    mpegnorm="-f $SVCDMODE -b $vbr -B 260 -V 230"
@@ -362,7 +362,7 @@
       
       # mjpegtools
       ($denoise < $VIDEO | \
-         yuvscaler -v 0 $wide -O $norm $size $yuvin | \
+         yuvscaler -v 0 $wide -O $vnorm $size $yuvin | \
          mpeg2enc -v 0 -s $mpegnorm $aratio -S $CDMAXSIZE -g 6 -G 15 -r 16 \
 	          $pd $framerate $yuvin -4 2 -2 1 -o $NAME.mpv) &