From fbe52e41884bb43e279de453b8052f681a6ccd51 Mon Sep 17 00:00:00 2001
From: Justin Ruggles <justin.ruggles@gmail.com>
Date: Sat, 31 May 2008 15:31:57 +0000
Subject: [PATCH] use enum value for CRC error
Originally committed as revision 13580 to svn://svn.ffmpeg.org/ffmpeg/trunk
---
libavcodec/ac3_parser.h | 1 +
libavcodec/ac3dec.c | 4 ++--
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/libavcodec/ac3_parser.h b/libavcodec/ac3_parser.h
index 63bea565123..1af7fa1407f 100644
--- a/libavcodec/ac3_parser.h
+++ b/libavcodec/ac3_parser.h
@@ -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;
/**
diff --git a/libavcodec/ac3dec.c b/libavcodec/ac3dec.c
index 0829784f27c..42903cbc10d 100644
--- a/libavcodec/ac3dec.c
+++ b/libavcodec/ac3dec.c
@@ -1157,12 +1157,12 @@ static int ac3_decode_frame(AVCodecContext * avctx, void *data, int *data_size,
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");
--
GitLab