generic-library/ffmpeg
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

use enum value for CRC error

Browse Source 
Originally committed as revision 13580 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
Justin Ruggles 2008-05-31 15:31:57 +00:00
parent c78c6d6c58
commit fbe52e4188
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libavcodec/ac3_parser.h
View File

@ -32,6 +32,7 @@ typedef enum {
AC3_PARSE_ERROR_SAMPLE_RATE = -3, AC3_PARSE_ERROR_SAMPLE_RATE = -3,
AC3_PARSE_ERROR_FRAME_SIZE = -4, AC3_PARSE_ERROR_FRAME_SIZE = -4,
AC3_PARSE_ERROR_FRAME_TYPE = -5, AC3_PARSE_ERROR_FRAME_TYPE = -5,
AC3_PARSE_ERROR_CRC = -6,
} AC3ParseError; } AC3ParseError;
/** /**

4
libavcodec/ac3dec.c
View File

@ -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(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)) { 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"); av_log(avctx, AV_LOG_ERROR, "frame CRC mismatch\n");
err = 1; err = AC3_PARSE_ERROR_CRC;
} }
} }
/* parse the syncinfo */ /* parse the syncinfo */
if(err && err != 1) { if(err && err != AC3_PARSE_ERROR_CRC) {
switch(err) { switch(err) {
case AC3_PARSE_ERROR_SYNC: case AC3_PARSE_ERROR_SYNC:
av_log(avctx, AV_LOG_ERROR, "frame sync error\n"); av_log(avctx, AV_LOG_ERROR, "frame sync error\n");