diff options
| author | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-04-15 01:06:51 +0100 |
|---|---|---|
| committer | Darren Salt <linux@youmustbejoking.demon.co.uk> | 2008-04-15 01:06:51 +0100 |
| commit | e79f77ee055a7503e3e27e945933602d080ecd7b (patch) | |
| tree | 683a2d446b45866646c7cf00c6710372dd5f2d48 /src/demuxers | |
| parent | f1925da5c80d4170425f6efb6ad68a2909074057 (diff) | |
| parent | c440431caef75667ce807f49ec72e029d7e5037f (diff) | |
| download | xine-lib-e79f77ee055a7503e3e27e945933602d080ecd7b.tar.gz xine-lib-e79f77ee055a7503e3e27e945933602d080ecd7b.tar.bz2 | |
Merge from 1.1.
--HG--
rename : debian/libxine1.install => debian/libxine2.install
rename : src/libxineadec/xine_speex_decoder.c => src/combined/xine_speex_decoder.c
rename : src/libsputext/demux_sputext.c => src/spu_dec/sputext_demuxer.c
Diffstat (limited to 'src/demuxers')
| -rw-r--r-- | src/demuxers/demux_qt.c | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/src/demuxers/demux_qt.c b/src/demuxers/demux_qt.c index b8e0acb12..9329403d7 100644 --- a/src/demuxers/demux_qt.c +++ b/src/demuxers/demux_qt.c @@ -1263,10 +1263,11 @@ static qt_error parse_trak_atom (qt_trak *trak, if (_X_BE_32(&trak_atom[atom_pos + 0x2C])) trak->stsd_atoms[k].audio.bytes_per_sample = _X_BE_32(&trak_atom[atom_pos + 0x2C]); - trak->stsd_atoms[k].audio.samples_per_frame = - (trak->stsd_atoms[k].audio.bytes_per_frame / - trak->stsd_atoms[k].audio.bytes_per_packet) * - trak->stsd_atoms[k].audio.samples_per_packet; + if (trak->stsd_atoms[k].audio.bytes_per_packet) + trak->stsd_atoms[k].audio.samples_per_frame = + (trak->stsd_atoms[k].audio.bytes_per_frame / + trak->stsd_atoms[k].audio.bytes_per_packet) * + trak->stsd_atoms[k].audio.samples_per_packet; } /* see if the trak deserves a promotion to VBR */ |