Browse Source

avcodec/takdec: also do crc check when er compliant is set

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
tags/n2.1
Michael Niedermayer 12 years ago
parent
commit
2886d6cbb7
1 changed files with 2 additions and 2 deletions
  1. +2
    -2
      libavcodec/takdec.c

+ 2
- 2
libavcodec/takdec.c View File

@@ -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) if ((ret = ff_tak_decode_frame_header(avctx, gb, &s->ti, 0)) < 0)
return ret; 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; hsize = get_bits_count(gb) / 8;
if (ff_tak_check_crc(pkt->data, hsize)) { if (ff_tak_check_crc(pkt->data, hsize)) {
av_log(avctx, AV_LOG_ERROR, "CRC error\n"); 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) else if (get_bits_left(gb) > 0)
av_log(avctx, AV_LOG_DEBUG, "underread\n"); 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, if (ff_tak_check_crc(pkt->data + hsize,
get_bits_count(gb) / 8 - hsize)) { get_bits_count(gb) / 8 - hsize)) {
av_log(avctx, AV_LOG_ERROR, "CRC error\n"); av_log(avctx, AV_LOG_ERROR, "CRC error\n");


Loading…
Cancel
Save