From patchwork Fri Nov 20 07:20:12 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23850 Return-Path: X-Original-To: patchwork@ffaux-bg.ffmpeg.org Delivered-To: patchwork@ffaux-bg.ffmpeg.org Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by ffaux.localdomain (Postfix) with ESMTP id 8AA01449F1B for ; Fri, 20 Nov 2020 09:42:42 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 8873268BC7D; Fri, 20 Nov 2020 09:26:13 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ej1-f53.google.com (mail-ej1-f53.google.com [209.85.218.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 6CBC468BC4A for ; Fri, 20 Nov 2020 09:25:50 +0200 (EET) Received: by mail-ej1-f53.google.com with SMTP id lv15so5644196ejb.12 for ; Thu, 19 Nov 2020 23:25:50 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references:reply-to :mime-version:content-transfer-encoding; bh=rjFoFSiLuAsyE6pDRkcQhCtKNkEN6dxcAwj11PJcvZc=; b=KgmywERUcSKA9JwX5fkLGt+RU0C9wFsMrWKS8kKM9uN679rQdiGhnh09WB22xTA6/C /Qluwcr/TEK3aUJeWm27/Y9MH/sPN5ifVc57nDwuJ5LsWLU1lFZKf5VLA4DLMq3Fve9R eLuDpLRnFdPnWtdS6fDXgU+Zm4s4dP0CiTlDyI6Lgc9kMyZqUyvREtHE7++/fQQcmbz/ NWHSU77sTzJ5ZuJQsor4wcQcPQ4cKuoZLg2iEELD9b2Z56uQcnyq3doYwD1hOhfHB7Dw PzJxzJykpV5dyb4RFP6a/Nwo3O9RCd2ECz+bz2qvIOgZmduXRscLyR72liTLJPREQBJD MxkA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references:reply-to:mime-version:content-transfer-encoding; bh=rjFoFSiLuAsyE6pDRkcQhCtKNkEN6dxcAwj11PJcvZc=; b=uI2uYGjL2kAHlvAQQUdtFBzZ9YX7eC0h+JF+QKQdE2ibNIbqnKLe0U782WFW4nuaeL K3tWl5ensLxLuAevcgeHQsShguumf2rFTVKZvRYgf4dSpCQaJUZZIyE++cjE1C8MksFR e0ylwsjCqcJzQXiXyPWlmYZ7Fw7RgSRAIBfdngUeuv4DBdUgGZkJfLZwxHAci2qca2UU FvUYCrMyhXdHzsmR2JZv1qVElJttJ2mgQQDncCkng0MPiWozWssf+xe4lH+GFVUbCDFi 8xJBB1kIKKFwd60ZMIl6kNcLLBTFkk3AHqMNefk+56M8aS09v5sKPHKsfcGTUqr9OeqR Ipdw== X-Gm-Message-State: AOAM533TurxomhQSEX/9mfkRkAkxFY0pz7GbQSBcWeXX9xvhPFbq/kFH +AyfmEDKAw8YaQL4MGozb+aXQyimVwo0jw== X-Google-Smtp-Source: ABdhPJx3fIvRtYIPwZDLl2lhip8MY4NaX101KlH/xgFQtYz4IApNYYMM+zsjG6gbPF9iFXOjWjK4RA== X-Received: by 2002:a17:906:a88:: with SMTP id y8mr33958717ejf.469.1605857149358; Thu, 19 Nov 2020 23:25:49 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id lz27sm779419ejb.39.2020.11.19.23.25.48 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 19 Nov 2020 23:25:48 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 20 Nov 2020 08:20:12 +0100 Message-Id: <20201120072116.818090-100-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201120072116.818090-1-andreas.rheinhardt@gmail.com> References: <20201120072116.818090-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2 099/162] avcodec/vc1_block, msmpeg4dec: Don't check for errors for complete VLCs X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.20 Precedence: list List-Id: FFmpeg development discussions and patches List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: FFmpeg development discussions and patches Cc: Andreas Rheinhardt Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Signed-off-by: Andreas Rheinhardt --- libavcodec/msmpeg4dec.c | 5 ----- libavcodec/vc1_block.c | 12 ------------ 2 files changed, 17 deletions(-) diff --git a/libavcodec/msmpeg4dec.c b/libavcodec/msmpeg4dec.c index 49df06a9d7..b3964457d6 100644 --- a/libavcodec/msmpeg4dec.c +++ b/libavcodec/msmpeg4dec.c @@ -614,11 +614,6 @@ static int msmpeg4_decode_dc(MpegEncContext * s, int n, int *dir_ptr) } else { level = get_vlc2(&s->gb, ff_msmp4_dc_chroma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3); } - if (level < 0){ - av_log(s->avctx, AV_LOG_ERROR, "illegal dc vlc\n"); - *dir_ptr = 0; - return -1; - } if (level == DC_MAX) { level = get_bits(&s->gb, 8); diff --git a/libavcodec/vc1_block.c b/libavcodec/vc1_block.c index ed6df541cf..714b3cdea0 100644 --- a/libavcodec/vc1_block.c +++ b/libavcodec/vc1_block.c @@ -584,10 +584,6 @@ static int vc1_decode_i_block(VC1Context *v, int16_t block[64], int n, } else { dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_chroma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3); } - if (dcdiff < 0) { - av_log(s->avctx, AV_LOG_ERROR, "Illegal DC VLC\n"); - return -1; - } if (dcdiff) { const int m = (v->pq == 1 || v->pq == 2) ? 3 - v->pq : 0; if (dcdiff == 119 /* ESC index value */) { @@ -732,10 +728,6 @@ static int vc1_decode_i_block_adv(VC1Context *v, int16_t block[64], int n, } else { dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_chroma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3); } - if (dcdiff < 0) { - av_log(s->avctx, AV_LOG_ERROR, "Illegal DC VLC\n"); - return -1; - } if (dcdiff) { const int m = (quant == 1 || quant == 2) ? 3 - quant : 0; if (dcdiff == 119 /* ESC index value */) { @@ -936,10 +928,6 @@ static int vc1_decode_intra_block(VC1Context *v, int16_t block[64], int n, } else { dcdiff = get_vlc2(&s->gb, ff_msmp4_dc_chroma_vlc[s->dc_table_index].table, DC_VLC_BITS, 3); } - if (dcdiff < 0) { - av_log(s->avctx, AV_LOG_ERROR, "Illegal DC VLC\n"); - return -1; - } if (dcdiff) { const int m = (quant == 1 || quant == 2) ? 3 - quant : 0; if (dcdiff == 119 /* ESC index value */) {