Mercurial > mplayer.hg

changeset 7754:0568245deeb8

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
ss_div/ss_mul defaults to 0
author arpi
date Wed, 16 Oct 2002 16:51:03 +0000
parents f569630d892f
children 7637b72ef1f9
files libmpdemux/demux_mov.c libmpdemux/demuxer.c
diffstat 2 files changed, 2 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/libmpdemux/demux_mov.c	Wed Oct 16 16:49:58 2002 +0000
+++ b/libmpdemux/demux_mov.c	Wed Oct 16 16:51:03 2002 +0000
@@ -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 !
--- a/libmpdemux/demuxer.c	Wed Oct 16 16:49:58 2002 +0000
+++ b/libmpdemux/demuxer.c	Wed Oct 16 16:51:03 2002 +0000
@@ -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;