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/takdec.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) (limited to 'libavcodec/takdec.c') diff --git a/libavcodec/takdec.c b/libavcodec/takdec.c index 8b3966112c..0d2dcbbdb2 100644 --- a/libavcodec/takdec.c +++ b/libavcodec/takdec.c @@ -693,7 +693,8 @@ static int tak_decode_frame(AVCodecContext *avctx, void *data, if (avctx->err_recognition & AV_EF_CRCCHECK) { if (ff_tak_check_crc(pkt->data, hsize)) { av_log(avctx, AV_LOG_ERROR, "CRC error\n"); - return AVERROR_INVALIDDATA; + if (avctx->err_recognition & AV_EF_EXPLODE) + return AVERROR_INVALIDDATA; } } @@ -867,7 +868,8 @@ static int tak_decode_frame(AVCodecContext *avctx, void *data, if (ff_tak_check_crc(pkt->data + hsize, get_bits_count(gb) / 8 - hsize)) { av_log(avctx, AV_LOG_ERROR, "CRC error\n"); - return AVERROR_INVALIDDATA; + if (avctx->err_recognition & AV_EF_EXPLODE) + return AVERROR_INVALIDDATA; } } -- cgit v1.2.3