From patchwork Tue Nov 10 10:48:16 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23553 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 4E996449CC7 for ; Tue, 10 Nov 2020 13:07:38 +0200 (EET) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C389368BF38; Tue, 10 Nov 2020 12:50:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wm1-f50.google.com (mail-wm1-f50.google.com [209.85.128.50]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 3764668BEDA for ; Tue, 10 Nov 2020 12:50:38 +0200 (EET) Received: by mail-wm1-f50.google.com with SMTP id c9so2516366wml.5 for ; Tue, 10 Nov 2020 02:50:38 -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=EaqyewPR8CImt186r5gCeOnZRm1S0chts7miKRCsXL4vJnSsJ2FpUBIrJuA4A7+MZw rB3fZWDqxsnKvhJqeOmf6LjiVmjpSoy600eB1xH7ssstDmBAR5eSdqA1Q8Jo5E8LzHG0 5jX0FkNk03/uJ+sKEStNTq9xUhg6se2PJ4dHOzfivEVKewlXEvMEO2qEB5MucXKTPW7R oDijGYc6hzSALGiF2rV2JB67OcubpTYr2gNPoy65Bd5E8tqmwbGts0/PYJWaDFiragnJ 4yuHnf/wW3/oGAIT0wosJK7I6b9voWjmO2TPkLGDpIShEI3P+KCaol4vkt6POKZgF5ve JkHg== 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=b3/Buu8XXtDTg+FhyuTa9T/HohmtjrrIQcjqWgHCVnUgRG7N35CoEKoAO9xbO9011D SyiQU2w/FxucEnczs4QzskLnfiC6KH54WUsayKy2WEe5nt1k1NMOEaXaHtxGJp0qf5Z0 krBjx9+nrp5qN9T/tzR4Ot96GtnVXDPv2RHafeEkcJSgzsJG4DiTqTuWcsZHIf94YNYn YoKNsJy5QITxfEPMYzKN9bFVGUdlqIhR1xyLoj8Kfp6Zztf0YL486mXwGObasT43Vk8R l0M95vXuYV0BGfYEYa1DJP1U4RKEJyMVEAOxA2Bh2b44XWjNLY2gBf0vFXmjgHTJHSnh L4eg== X-Gm-Message-State: AOAM5311afy+wrXB2lIzmrye3tEyQMUlJzdKd8N5mVcb2NTRjjfOqrcR D+Nxs1+Xn5iLmZMuuIto1ODny4VAmxw= X-Google-Smtp-Source: ABdhPJzILTR5qpblnx0/9IHNirAZkpQzVzzxWHqD1DvH4N7sy1e217Nji7Pg5orwK67Z3GAWAySROA== X-Received: by 2002:a1c:328a:: with SMTP id y132mr4039615wmy.134.1605005437177; Tue, 10 Nov 2020 02:50:37 -0800 (PST) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id l24sm2572543wmi.7.2020.11.10.02.50.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 10 Nov 2020 02:50:36 -0800 (PST) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Tue, 10 Nov 2020 11:48:16 +0100 Message-Id: <20201110104851.321029-80-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201110104851.321029-1-andreas.rheinhardt@gmail.com> References: <20201110104851.321029-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 079/114] 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 */) {