diff options
| author | foo86 <foobaz86@gmail.com> | 2016-05-03 03:42:36 +0300 |
|---|---|---|
| committer | James Almer <jamrial@gmail.com> | 2016-05-03 16:40:43 -0300 |
| commit | b7d267399b0ab53d2dc00ee191707df4cc8bd536 (patch) | |
| tree | 5cbdf1a4c0ec8c96a82f9880f06b8179588837b9 /libavcodec/dca_xll.c | |
| parent | 77a7ff8f0501c0cca268f55241d57ed7b6b6fac3 (diff) | |
| download | ffmpeg-b7d267399b0ab53d2dc00ee191707df4cc8bd536.tar.gz | |
avcodec/dca: convert to AVCRC
Signed-off-by: James Almer <jamrial@gmail.com>
Diffstat (limited to 'libavcodec/dca_xll.c')
| -rw-r--r-- | libavcodec/dca_xll.c | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/libavcodec/dca_xll.c b/libavcodec/dca_xll.c index 5e6cf35c5d..316af27b89 100644 --- a/libavcodec/dca_xll.c +++ b/libavcodec/dca_xll.c @@ -123,8 +123,7 @@ static int chs_parse_header(DCAXllDecoder *s, DCAXllChSet *c, DCAExssAsset *asse header_size = get_bits(&s->gb, 10) + 1; // Check CRC - if ((s->avctx->err_recognition & (AV_EF_CRCCHECK | AV_EF_CAREFUL)) - && ff_dca_check_crc(&s->gb, header_pos, header_pos + header_size * 8)) { + if (ff_dca_check_crc(s->avctx, &s->gb, header_pos, header_pos + header_size * 8)) { av_log(s->avctx, AV_LOG_ERROR, "Invalid XLL sub-header checksum\n"); return AVERROR_INVALIDDATA; } @@ -784,8 +783,7 @@ static int parse_common_header(DCAXllDecoder *s) header_size = get_bits(&s->gb, 8) + 1; // Check CRC - if ((s->avctx->err_recognition & (AV_EF_CRCCHECK | AV_EF_CAREFUL)) - && ff_dca_check_crc(&s->gb, 32, header_size * 8)) { + if (ff_dca_check_crc(s->avctx, &s->gb, 32, header_size * 8)) { av_log(s->avctx, AV_LOG_ERROR, "Invalid XLL common header checksum\n"); return AVERROR_INVALIDDATA; } @@ -993,8 +991,7 @@ static int parse_navi_table(DCAXllDecoder *s) skip_bits(&s->gb, 16); // Check CRC - if ((s->avctx->err_recognition & (AV_EF_CRCCHECK | AV_EF_CAREFUL)) - && ff_dca_check_crc(&s->gb, navi_pos, get_bits_count(&s->gb))) { + if (ff_dca_check_crc(s->avctx, &s->gb, navi_pos, get_bits_count(&s->gb))) { av_log(s->avctx, AV_LOG_ERROR, "Invalid NAVI checksum\n"); return AVERROR_INVALIDDATA; } |