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

[ramiro]

Author: ramiro
Date: Mon Mar 30 05:46:52 2009
New Revision: 18240

Log:
mlpdec: Simplify check for substream_parity_present.

Modified:
   trunk/libavcodec/mlpdec.c

Modified: trunk/libavcodec/mlpdec.c
==============================================================================
--- trunk/libavcodec/mlpdec.c	Mon Mar 30 05:44:20 2009	(r18239)
+++ trunk/libavcodec/mlpdec.c	Mon Mar 30 05:46:52 2009	(r18240)
@@ -1032,10 +1032,12 @@ static int read_access_unit(AVCodecConte
             if (substr == m->max_decoded_substream)
                 av_log(m->avctx, AV_LOG_INFO, "End of stream indicated.\n");
         }
-        if (substream_data_len[substr] * 8 - get_bits_count(&gb) >= 16 &&
-            substream_parity_present[substr]) {
+        if (substream_parity_present[substr]) {
             uint8_t parity, checksum;
 
+            if (substream_data_len[substr] * 8 - get_bits_count(&gb) != 16)
+                goto substream_length_mismatch;
+
             parity   = ff_mlp_calculate_parity(buf, substream_data_len[substr] - 2);
             checksum = ff_mlp_checksum8       (buf, substream_data_len[substr] - 2);