[FFmpeg-cvslog] r14206 - trunk/libavcodec/mlpdec.c

[ramiro]

Author: ramiro
Date: Sun Jul 13 16:59:39 2008
New Revision: 14206

Log:
mlpdec: Check for bits left before each read of End-of-Stream indicator and
Substream parity check independently. This allows decoding of streams that
have EOS but don't have Substream parity check.

Modified:
   trunk/libavcodec/mlpdec.c

Modified: trunk/libavcodec/mlpdec.c
==============================================================================
--- trunk/libavcodec/mlpdec.c	(original)
+++ trunk/libavcodec/mlpdec.c	Sun Jul 13 16:59:39 2008
@@ -1119,7 +1119,7 @@ static int read_access_unit(AVCodecConte
                  && get_bits1(&gb) == 0);
 
         skip_bits(&gb, (-get_bits_count(&gb)) & 15);
-        if (substream_data_len[substr] * 8 - get_bits_count(&gb) >= 48 &&
+        if (substream_data_len[substr] * 8 - get_bits_count(&gb) >= 32 &&
             (show_bits_long(&gb, 32) == 0xd234d234 ||
              show_bits_long(&gb, 20) == 0xd234e)) {
             skip_bits(&gb, 18);
@@ -1133,7 +1133,8 @@ static int read_access_unit(AVCodecConte
             } else
                 skip_bits(&gb, 13);
         }
-        if (substream_parity_present[substr]) {
+        if (substream_data_len[substr] * 8 - get_bits_count(&gb) >= 16 &&
+            substream_parity_present[substr]) {
             uint8_t parity, checksum;
 
             parity = calculate_parity(buf, substream_data_len[substr] - 2);