[FFmpeg-cvslog] r11379 - trunk/libavcodec/ac3dec.c

[jbr]

Author: jbr
Date: Thu Jan  3 03:26:29 2008
New Revision: 11379

Log:
add crc check to ac3 decoder

Modified:
   trunk/libavcodec/ac3dec.c

Modified: trunk/libavcodec/ac3dec.c
==============================================================================
--- trunk/libavcodec/ac3dec.c	(original)
+++ trunk/libavcodec/ac3dec.c	Thu Jan  3 03:26:29 2008
@@ -35,6 +35,7 @@
 #include "avcodec.h"
 #include "ac3_parser.h"
 #include "bitstream.h"
+#include "crc.h"
 #include "dsputil.h"
 #include "random.h"
 
@@ -1101,15 +1102,21 @@ static int ac3_decode_frame(AVCodecConte
         return -1;
     }
 
-    avctx->sample_rate = s->sample_rate;
-    avctx->bit_rate = s->bit_rate;
-
     /* check that reported frame size fits in input buffer */
     if(s->frame_size > buf_size) {
         av_log(avctx, AV_LOG_ERROR, "incomplete frame\n");
         return -1;
     }
 
+    /* check for crc mismatch */
+    if(av_crc(av_crc8005, 0, &buf[2], s->frame_size-2)) {
+        av_log(avctx, AV_LOG_ERROR, "frame CRC mismatch\n");
+        return -1;
+    }
+
+    avctx->sample_rate = s->sample_rate;
+    avctx->bit_rate = s->bit_rate;
+
     /* channel config */
     s->out_channels = s->channels;
     if (avctx->request_channels > 0 && avctx->request_channels <= 2 &&