[Ffmpeg-cvslog] CVS: ffmpeg/libavformat mov.c,1.117,1.118

[Corey Hickey CVS]

Update of /cvsroot/ffmpeg/ffmpeg/libavformat
In directory mail:/var2/tmp/cvs-serv27305/libavformat

Modified Files:
	mov.c 
Log Message:
Support mov stsd atom version 2.

Patch by Baptiste COUDURIER, baptiste <<dot>> coudurier <<at>> smartjog <<dot>> com


Index: mov.c
===================================================================
RCS file: /cvsroot/ffmpeg/ffmpeg/libavformat/mov.c,v
retrieving revision 1.117
retrieving revision 1.118
diff -u -d -r1.117 -r1.118
--- mov.c	22 Feb 2006 23:46:20 -0000	1.117
+++ mov.c	4 Mar 2006 01:13:13 -0000	1.118
@@ -1063,6 +1063,15 @@
                 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 ...) */