aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-02-13 13:11:10 +0000
committerBaptiste Coudurier <baptiste.coudurier@gmail.com>2008-02-13 13:11:10 +0000
commit6a1f4535f8891d42d1f2d8571836ea59d336d6a2 (patch)
treeba9289898ce4fc697283371a36592100f3c40a95
parentf8cda19ee6285cc83471f87357a1c6f6076706ef (diff)
downloadffmpeg-6a1f4535f8891d42d1f2d8571836ea59d336d6a2.tar.gz
10l, forgot alaw/mulaw mono, use bits_per_sample in fact,
it should correctly set by av_get_bits_per_sample if recognized Originally committed as revision 11925 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/mov.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 0869dad282..27a4e47262 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1387,8 +1387,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->codec_id == CODEC_ID_PCM_U8 || st->codec->codec_id == CODEC_ID_PCM_S8)
+ if (sc->sample_size > 1 || st->codec->bits_per_sample == 8)
chunk_size = chunk_samples * sc->sample_size;
else if (sc->samples_per_frame > 0 &&
(chunk_samples * sc->bytes_per_frame % sc->samples_per_frame == 0)) {