[libav-devel] [PATCH] mpegaudiodec: skip all channels when skipping granules

[Justin Ruggles]

This fixes "overread" error messages when seeking.
---
 libavcodec/mpegaudiodec.c |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libavcodec/mpegaudiodec.c b/libavcodec/mpegaudiodec.c
index ad3b199..b8a8669 100644
--- a/libavcodec/mpegaudiodec.c
+++ b/libavcodec/mpegaudiodec.c
@@ -1552,8 +1552,8 @@ static int mp_decode_layer3(MPADecodeContext *s)
         s->gb.size_in_bits_plus8 += EXTRABYTES * 8;
 #endif
         s->last_buf_size <<= 3;
-        for (gr = 0, ch = 0; gr < nb_granules && (s->last_buf_size >> 3) < 
main_data_begin; gr++, ch = 0) {
-            for (; ch < s->nb_channels && (s->last_buf_size >> 3) < 
main_data_begin; ch++) {
+        for (gr = 0; gr < nb_granules && (s->last_buf_size >> 3) < 
main_data_begin; gr++) {
+            for (ch = 0; ch < s->nb_channels; ch++) {
                 g = &s->granules[ch][gr];
                 s->last_buf_size += g->part2_3_length;
                 memset(g->sb_hybrid, 0, sizeof(g->sb_hybrid));
@@ -1566,11 +1566,11 @@ static int mp_decode_layer3(MPADecodeContext *s)
             s->in_gb.buffer = NULL;
         }
     } else {
-        gr = ch = 0;
+        gr = 0;
     }
 
-    for (; gr < nb_granules; gr++, ch = 0) {
-        for (; ch < s->nb_channels; ch++) {
+    for (; gr < nb_granules; gr++) {
+        for (ch = 0; ch < s->nb_channels; ch++) {
             g = &s->granules[ch][gr];
             bits_pos = get_bits_count(&s->gb);
 
-- 
1.7.1

_______________________________________________
libav-devel mailing list
libav-devel@libav.org
https://lists.libav.org/mailman/listinfo/libav-devel