mlpdec: There must be no extraword for MLP.
authorRamiro Polla <ramiro.polla@gmail.com>
Sun, 5 Apr 2009 20:54:19 +0000 (20:54 +0000)
committerRamiro Polla <ramiro.polla@gmail.com>
Sun, 5 Apr 2009 20:54:19 +0000 (20:54 +0000)
Originally committed as revision 18337 to svn://svn.ffmpeg.org/ffmpeg/trunk

libavcodec/mlpdec.c

index 516c17f..9b36b2e 100644 (file)
@@ -950,6 +950,10 @@ static int read_access_unit(AVCodecContext *avctx, void* data, int *data_size,
         substr_header_size += 2;
 
         if (extraword_present) {
         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;
         }
             skip_bits(&gb, 16);
             substr_header_size += 2;
         }