summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBaptiste Coudurier <baptiste.coudurier@smartjog.com>2006-03-04 01:13:13 +0000
committerCorey Hickey <bugfood-ml@fatooh.org>2006-03-04 01:13:13 +0000
commit6a045bf3bd39ad2d8b091dd4b6331473e89357b2 (patch)
tree49a444a6f334dab790d6b0a538f7346c2b70e6ec
parentae9e417358f863c2401fe9329576e3e28f8b294a (diff)
Support mov stsd atom version 2.
Patch by Baptiste COUDURIER, baptiste <<dot>> coudurier <<at>> smartjog <<dot>> com Originally committed as revision 5106 to svn://svn.ffmpeg.org/ffmpeg/trunk
-rw-r--r--libavformat/mov.c9
1 files changed, 9 insertions, 0 deletions
diff --git a/libavformat/mov.c b/libavformat/mov.c
index 7449925d23..39ebb8ef56 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -1063,6 +1063,15 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
get_be32(pb); /* bytes per packet */
get_be32(pb); /* bytes per frame */
get_be32(pb); /* bytes per sample */
+ } else if(version==2) {
+ get_be32(pb); /* sizeof struct only */
+ st->codec->sample_rate = av_int2dbl(get_be64(pb)); /* float 64 */
+ st->codec->channels = get_be32(pb);
+ get_be32(pb); /* always 0x7F000000 */
+ get_be32(pb); /* bits per channel if sound is uncompressed */
+ get_be32(pb); /* lcpm format specific flag */
+ get_be32(pb); /* bytes per audio packet if constant */
+ get_be32(pb); /* lpcm frames per audio packet if constant */
}
} else {
/* other codec type, just skip (rtp, mp4s, tmcd ...) */