diff options
| author | Anton Khirnov <anton@khirnov.net> | 2013-10-26 22:46:48 +0200 |
|---|---|---|
| committer | Anton Khirnov <anton@khirnov.net> | 2013-10-28 07:22:18 +0100 |
| commit | 23a211cbba0b7c9ee694040031b2e5da1be54a00 (patch) | |
| tree | cf496d9ae1c70bd97f985b1ac6b1e3e377802a6a /libavcodec/tta.c | |
| parent | f354f30836a3148275ce60d19bbc581310249ad2 (diff) | |
| download | ffmpeg-23a211cbba0b7c9ee694040031b2e5da1be54a00.tar.gz | |
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.
Diffstat (limited to 'libavcodec/tta.c')
| -rw-r--r-- | libavcodec/tta.c | 6 |
1 files changed, 4 insertions, 2 deletions
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; } |