[Mplayer-cvslog] CVS: main/libmpdemux demux_mov.c,1.75,1.76 demuxer.c,1.117,1.118

[Arpi of Ize]

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

Modified Files:
	demux_mov.c demuxer.c 
Log Message:
ss_div/ss_mul defaults to 0

Index: demux_mov.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demux_mov.c,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- demux_mov.c	7 Oct 2002 16:43:04 -0000	1.75
+++ demux_mov.c	16 Oct 2002 16:51:02 -0000	1.76
@@ -1399,7 +1399,7 @@
 //	x*=char2int(trak->stdata,32); // bytes/packet
 	x*=char2int(trak->stdata,36); // bytes/frame
       } else {
-	if(ds->ss_div!=1 || ds->ss_mul!=1){
+	if(ds->ss_div && ds->ss_mul){
 	    // workaround for buggy files like 7up-high-traffic-areas.mov,
 	    // with missing stsd v1 header containing compression rate
 	    x/=ds->ss_div; x*=ds->ss_mul; // compression ratio fix  ! HACK !

Index: demuxer.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/demuxer.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -r1.117 -r1.118
--- demuxer.c	4 Oct 2002 19:23:36 -0000	1.117
+++ demuxer.c	16 Oct 2002 16:51:03 -0000	1.118
@@ -46,7 +46,7 @@
   ds->asf_seq=-1;
   ds->asf_packet=NULL;
 //----------------
-  ds->ss_mul=ds->ss_div=1;
+  ds->ss_mul=ds->ss_div=0;
   ds->block_size=1;
 //----------------
   ds->sh=NULL;