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/takdec.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/takdec.c')
| -rw-r--r-- | libavcodec/takdec.c | 6 |
1 files changed, 4 insertions, 2 deletions
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; } } |