[FFmpeg-devel] [PATCH 3/3] avcodec/tta: also do crc check when er compliant is set

Paul B Mahol onemda at gmail.com
Sun Oct 27 18:16:13 CET 2013


On 10/27/13, Michael Niedermayer <michaelni at gmx.at> wrote:
> As well as do the header crc check at "er careful" level
>
> Signed-off-by: Michael Niedermayer <michaelni at gmx.at>
> ---
>  libavcodec/takdec.c |    4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
>
> diff --git a/libavcodec/takdec.c b/libavcodec/takdec.c
> index 1017032..67049b6 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_CAREFUL)) {
>          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");
> --
> 1.7.9.5
>
> _______________________________________________
> ffmpeg-devel mailing list
> ffmpeg-devel at ffmpeg.org
> http://ffmpeg.org/mailman/listinfo/ffmpeg-devel
>

Why this got into tta thread?


More information about the ffmpeg-devel mailing list