aac: clear M/S flags

[nihav.git] / nihav-mpeg / src / codecs / aac / mod.rs

diff --git a/nihav-mpeg/src/codecs/aac/mod.rs b/nihav-mpeg/src/codecs/aac/mod.rs
index 179134ccdd2fafa55f7dabf3e87115822f74c660..e37e812357489f9d39a7eca502e8d32de7909aa0 100644 (file)
--- a/nihav-mpeg/src/codecs/aac/mod.rs
+++ b/nihav-mpeg/src/codecs/aac/mod.rs
@@ -330,12 +330,14 @@ impl ChannelPair {
                         self.ms_used[g][sfb]            = br.read_bool()?;
                     }
                 }
+            } else {
+                self.ms_used = [[false; MAX_SFBS]; MAX_WINDOWS];
             }
             self.ics[1].info = self.ics[0].info;
         }
         self.ics[0].decode_ics(br, codebooks, m4atype, common_window, true)?;
         self.ics[1].decode_ics(br, codebooks, m4atype, common_window, true)?;
-        if common_window && self.ms_mask_present != 0 {
+        if common_window {
             let mut g = 0;
             for w in 0..self.ics[0].info.num_windows {
                 if w > 0 && !self.ics[0].info.scale_factor_grouping[w - 1] {