summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-10-16 16:51:03 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-10-16 16:51:03 +0000
commit4644a460cb4871320bbee4b0fe3efc3d086bfe03 (patch)
tree384c372538aeb81bbc0b7b2d76d5baa5ac405782 /libmpdemux
parent6d80c0060e6634af945f4550d9597e7960cdb022 (diff)
downloadmpv-4644a460cb4871320bbee4b0fe3efc3d086bfe03.tar.bz2
mpv-4644a460cb4871320bbee4b0fe3efc3d086bfe03.tar.xz
ss_div/ss_mul defaults to 0
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7755 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/demux_mov.c2
-rw-r--r--libmpdemux/demuxer.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/libmpdemux/demux_mov.c b/libmpdemux/demux_mov.c
index 0623809221..02e2c6cb88 100644
--- a/libmpdemux/demux_mov.c
+++ b/libmpdemux/demux_mov.c
@@ -1399,7 +1399,7 @@ if(trak->samplesize){
// 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 !
diff --git a/libmpdemux/demuxer.c b/libmpdemux/demuxer.c
index 2812bd8296..08a235fcf9 100644
--- a/libmpdemux/demuxer.c
+++ b/libmpdemux/demuxer.c
@@ -46,7 +46,7 @@ demux_stream_t* new_demuxer_stream(struct demuxer_st *demuxer,int id){
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;