From: Ramiro Polla <ramiro.polla@gmail.com>
Date: Sun, 5 Apr 2009 20:54:19 +0000 (+0000)
Subject: mlpdec: There must be no extraword for MLP.
X-Git-Tag: v0.6~4925
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=89e39be3b647c5c04bf96a927fa2b355af4c53e7;p=coroid%2Fffmpeg_saccubus.git

mlpdec: There must be no extraword for MLP.

Originally committed as revision 18337 to svn://svn.ffmpeg.org/ffmpeg/trunk
---

diff --git a/libavcodec/mlpdec.c b/libavcodec/mlpdec.c
index 516c17f07..9b36b2e5b 100644
--- a/libavcodec/mlpdec.c
+++ b/libavcodec/mlpdec.c
@@ -950,6 +950,10 @@ static int read_access_unit(AVCodecContext *avctx, void* data, int *data_size,
         substr_header_size += 2;
 
         if (extraword_present) {
+            if (m->avctx->codec_id == CODEC_ID_MLP) {
+                av_log(m->avctx, AV_LOG_ERROR, "There must be no extraword for MLP.\n");
+                goto error;
+            }
             skip_bits(&gb, 16);
             substr_header_size += 2;
         }