xa: do not set bit_rate, block_align, or bits_per_coded_sample
authorJustin Ruggles <justin.ruggles@gmail.com>
Tue, 20 Mar 2012 16:00:00 +0000 (12:00 -0400)
committerJustin Ruggles <justin.ruggles@gmail.com>
Tue, 20 Mar 2012 18:12:53 +0000 (14:12 -0400)
The values in the header refer to decoded data, not compressed data.

libavformat/xa.c

index aacdd2b..4cec2da 100644 (file)
@@ -80,10 +80,9 @@ static int xa_read_header(AVFormatContext *s)
     avio_skip(pb, 2);       /* Skip the tag */
     st->codec->channels     = avio_rl16(pb);
     st->codec->sample_rate  = avio_rl32(pb);
-    /* Value in file is average byte rate*/
-    st->codec->bit_rate     = avio_rl32(pb) * 8;
-    st->codec->block_align  = avio_rl16(pb);
-    st->codec->bits_per_coded_sample = avio_rl16(pb);
+    avio_skip(pb, 4);       /* Skip average byte rate */
+    avio_skip(pb, 2);       /* Skip block align */
+    avio_skip(pb, 2);       /* Skip bits-per-sample */
 
     avpriv_set_pts_info(st, 64, 1, st->codec->sample_rate);
     st->start_time = 0;