fix mac3audio.mov, pcm_s8 and pcm_u8 can only have sample size of 1 and only if mono, dont rely on bits per sample which can be wrong

Originally committed as revision 6079 to svn://svn.ffmpeg.org/ffmpeg/trunk
pull/126/head
Baptiste Coudurier 19 years ago
parent acf36dba18
commit c61900c6e9
  1. 2
      libavformat/mov.c

@ -1598,7 +1598,7 @@ static void mov_build_index(MOVContext *mov, AVStream *st)
stsc_index++;
chunk_samples = sc->sample_to_chunk[stsc_index].count;
/* get chunk size */
if (sc->sample_size > 1 || st->codec->bits_per_sample == 8)
if (sc->sample_size > 1 || st->codec->codec_id == CODEC_ID_PCM_U8 || st->codec->codec_id == CODEC_ID_PCM_S8)
chunk_size = chunk_samples * sc->sample_size;
else if (sc->sample_size_v1.den > 0 && (chunk_samples * sc->sample_size_v1.num % sc->sample_size_v1.den == 0))
chunk_size = chunk_samples * sc->sample_size_v1.num / sc->sample_size_v1.den;

Loading…
Cancel
Save