[SCM] libav/experimental: more complete audio stsd v2

[siretart at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 9184d53a031a9c061caef90a1542e98a43ca6353
Author: Baptiste Coudurier <baptiste.coudurier at gmail.com>
Date:   Sat Aug 2 03:40:13 2008 +0000

    more complete audio stsd v2
    
    Originally committed as revision 14505 to svn://svn.ffmpeg.org/ffmpeg/trunk

diff --git a/libavformat/mov.c b/libavformat/mov.c
index f738243..551eca9 100644
--- a/libavformat/mov.c
+++ b/libavformat/mov.c
@@ -861,10 +861,10 @@ static int mov_read_stsd(MOVContext *c, ByteIOContext *pb, MOV_atom_t atom)
                     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 */
+                    st->codec->bits_per_sample = 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 */
+                    sc->bytes_per_frame = get_be32(pb); /* bytes per audio packet if constant */
+                    sc->samples_per_frame = get_be32(pb); /* lpcm frames per audio packet if constant */
                 }
             }
 

-- 
Libav/FFmpeg packaging