From 23a211cbba0b7c9ee694040031b2e5da1be54a00 Mon Sep 17 00:00:00 2001 From: Anton Khirnov Date: Sat, 26 Oct 2013 22:46:48 +0200 Subject: lavc: change all decoders to behave consistently with AV_EF_CRCCHECK. Just crccheck prints a warning, crccheck+explode returns an error. Also document this behavior. --- libavcodec/tta.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libavcodec/tta.c') diff --git a/libavcodec/tta.c b/libavcodec/tta.c index 53c8acaa6e..4d2e2a00be 100644 --- a/libavcodec/tta.c +++ b/libavcodec/tta.c @@ -275,7 +275,8 @@ static av_cold int tta_decode_init(AVCodecContext * avctx) avctx->extradata_size - 26 < total_frames * 4) av_log(avctx, AV_LOG_WARNING, "Seek table missing or too small\n"); else if (avctx->err_recognition & AV_EF_CRCCHECK) { - if (tta_check_crc(s, avctx->extradata + 22, total_frames * 4)) + int ret = tta_check_crc(s, avctx->extradata + 22, total_frames * 4); + if (ret < 0 && avctx->err_recognition & AV_EF_EXPLODE) return AVERROR_INVALIDDATA; } skip_bits_long(&s->gb, 32 * total_frames); @@ -316,7 +317,8 @@ static int tta_decode_frame(AVCodecContext *avctx, void *data, int32_t *p; if (avctx->err_recognition & AV_EF_CRCCHECK) { - if (buf_size < 4 || tta_check_crc(s, buf, buf_size - 4)) + if (buf_size < 4 || + (tta_check_crc(s, buf, buf_size - 4) && avctx->err_recognition & AV_EF_EXPLODE)) return AVERROR_INVALIDDATA; } -- cgit v1.2.3