[FFmpeg-cvslog] r13580 - in trunk/libavcodec: ac3_parser.h ac3dec.c

[jbr]

Author: jbr
Date: Sat May 31 17:31:57 2008
New Revision: 13580

Log:
use enum value for CRC error

Modified:
   trunk/libavcodec/ac3_parser.h
   trunk/libavcodec/ac3dec.c

Modified: trunk/libavcodec/ac3_parser.h
==============================================================================
--- trunk/libavcodec/ac3_parser.h	(original)
+++ trunk/libavcodec/ac3_parser.h	Sat May 31 17:31:57 2008
@@ -32,6 +32,7 @@ typedef enum {
     AC3_PARSE_ERROR_SAMPLE_RATE = -3,
     AC3_PARSE_ERROR_FRAME_SIZE  = -4,
     AC3_PARSE_ERROR_FRAME_TYPE  = -5,
+    AC3_PARSE_ERROR_CRC         = -6,
 } AC3ParseError;
 
 /**

Modified: trunk/libavcodec/ac3dec.c
==============================================================================
--- trunk/libavcodec/ac3dec.c	(original)
+++ trunk/libavcodec/ac3dec.c	Sat May 31 17:31:57 2008
@@ -1157,12 +1157,12 @@ static int ac3_decode_frame(AVCodecConte
     if(err != AC3_PARSE_ERROR_FRAME_SIZE && avctx->error_resilience >= FF_ER_CAREFUL) {
         if(av_crc(av_crc_get_table(AV_CRC_16_ANSI), 0, &buf[2], s->frame_size-2)) {
             av_log(avctx, AV_LOG_ERROR, "frame CRC mismatch\n");
-            err = 1;
+            err = AC3_PARSE_ERROR_CRC;
         }
     }
 
     /* parse the syncinfo */
-    if(err && err != 1) {
+    if(err && err != AC3_PARSE_ERROR_CRC) {
         switch(err) {
             case AC3_PARSE_ERROR_SYNC:
                 av_log(avctx, AV_LOG_ERROR, "frame sync error\n");