diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-10-27 09:28:30 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-10-27 21:18:40 +0100 |
| commit | 2886d6cbb71b9fc79b584fda201d55aad616b237 (patch) | |
| tree | fb4807f1e21d26a6c8fa34682ab0a46376b9b0fc /libavcodec | |
| parent | d206fd996bdaa501e341d9397cff8529b38a9ad9 (diff) | |
| download | ffmpeg-2886d6cbb71b9fc79b584fda201d55aad616b237.tar.gz | |
avcodec/takdec: also do crc check when er compliant is set
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
Diffstat (limited to 'libavcodec')
| -rw-r--r-- | libavcodec/takdec.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/libavcodec/takdec.c b/libavcodec/takdec.c index 1017032703..77de4c095f 100644 --- a/libavcodec/takdec.c +++ b/libavcodec/takdec.c @@ -686,7 +686,7 @@ static int tak_decode_frame(AVCodecContext *avctx, void *data, if ((ret = ff_tak_decode_frame_header(avctx, gb, &s->ti, 0)) < 0) return ret; - if (avctx->err_recognition & AV_EF_CRCCHECK) { + if (avctx->err_recognition & (AV_EF_CRCCHECK|AV_EF_COMPLIANT)) { hsize = get_bits_count(gb) / 8; if (ff_tak_check_crc(pkt->data, hsize)) { av_log(avctx, AV_LOG_ERROR, "CRC error\n"); @@ -861,7 +861,7 @@ static int tak_decode_frame(AVCodecContext *avctx, void *data, else if (get_bits_left(gb) > 0) av_log(avctx, AV_LOG_DEBUG, "underread\n"); - if (avctx->err_recognition & AV_EF_CRCCHECK) { + if (avctx->err_recognition & (AV_EF_CRCCHECK | AV_EF_COMPLIANT)) { if (ff_tak_check_crc(pkt->data + hsize, get_bits_count(gb) / 8 - hsize)) { av_log(avctx, AV_LOG_ERROR, "CRC error\n"); |