From patchwork Fri Oct 23 20:54:54 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andreas Rheinhardt X-Patchwork-Id: 23188 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 5EDEA441C30 for ; Fri, 23 Oct 2020 23:55:36 +0300 (EEST) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 46E2E68A2B6; Fri, 23 Oct 2020 23:55:36 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-wr1-f66.google.com (mail-wr1-f66.google.com [209.85.221.66]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1147E687F40 for ; Fri, 23 Oct 2020 23:55:28 +0300 (EEST) Received: by mail-wr1-f66.google.com with SMTP id n6so3738203wrm.13 for ; Fri, 23 Oct 2020 13:55:28 -0700 (PDT) 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 :mime-version:content-transfer-encoding; bh=gvOokysJKLDy8f+7MJJvmRz1uq5EENmc1KlmGUVVPEg=; b=COw6ToPC51sK/S12xLuvNSfvnvDDlErI+KL45rqLssTiaX8HL6J+5aK20Rl32o/xs8 Bwy5rQVDUCWLfAOMXluzWJhv+bv3+OMhBb53u8ezYdG4qnmDtPDOcWRtGzJWjwjZWM9W Wlhe3hH/AdEQvJnIZPK5VqxEWrdO1POqCvB7IBwWRi9giTKX75CNOx1+UK3otBieK2lq D3Y486Rt9B0/aS84m7LTAgTqlUcE8ACTxJcs6sa4vbg48IgKdBV1g0EcfdeoIEEAotnU msh32gMO+knyRqOvAAWLTPZ8FWPZnRz0gCuNpjPbarFOQa4/X1MlE6kehyCFZ5L9KBmA 1osQ== 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:mime-version:content-transfer-encoding; bh=gvOokysJKLDy8f+7MJJvmRz1uq5EENmc1KlmGUVVPEg=; b=Ns6a+EBDPK+t4mLQWyn4xPOHU4qXVkAD1lUse+7gTc8/Bcwf6CbOVpQ0mIBZZ5lQSi g/TNJeqWOSoRB+WmiXv0o3V+9qrpLuV5kQZ5QKNMSEr+xcmys+Xz88X01kM/Ld+jcNa4 l41wH72nxXZlF1IoTz1C4PL0QOEOFq29C63E6F208wY3q6usNQ/7i8GRElHz7pVn+zQV eSP6ADBaGfl/AeSivmQpfBRSOyt5Ny0KXbZcMlYz4RLwFEx2Aj9/VduNr31DFbtmPwm/ njgVRDnM9gK1Q1DnIGR3rvG1+s/rNaiHh2bmYxTqxp//7HOO0wOeNxNf5ft7O8EDoEWF QtFg== X-Gm-Message-State: AOAM533zPELnKVcv45NjjkoJySHvCSoWu1v+q2ZBzQbtyFiIhgf6MvXw kpfbIGD8Qk+qu7WIGLPaxvqoyQC9hwk= X-Google-Smtp-Source: ABdhPJzEpTpAXuxaxvk80Fk+MEe9xwXzkx7jeoMZ9QtQ1YWIaGzOCkoZDFBjet+3nXqou5lWANgAEA== X-Received: by 2002:a5d:6591:: with SMTP id q17mr4445214wru.173.1603486527191; Fri, 23 Oct 2020 13:55:27 -0700 (PDT) Received: from sblaptop.fritz.box (ipbcc1aa4b.dynamic.kabel-deutschland.de. [188.193.170.75]) by smtp.gmail.com with ESMTPSA id z6sm5153350wmi.28.2020.10.23.13.55.26 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Fri, 23 Oct 2020 13:55:26 -0700 (PDT) From: Andreas Rheinhardt To: ffmpeg-devel@ffmpeg.org Date: Fri, 23 Oct 2020 22:54:54 +0200 Message-Id: <20201023205454.851696-4-andreas.rheinhardt@gmail.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20201023205454.851696-1-andreas.rheinhardt@gmail.com> References: <20201023205454.851696-1-andreas.rheinhardt@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/mpeg4videodec: 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/mpeg4videodec.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/libavcodec/mpeg4videodec.c b/libavcodec/mpeg4videodec.c index c26ad616b8..ff5c6acf67 100644 --- a/libavcodec/mpeg4videodec.c +++ b/libavcodec/mpeg4videodec.c @@ -1845,10 +1845,7 @@ static int mpeg4_decode_studio_block(MpegEncContext *s, int32_t block[64], int n quant_matrix = s->chroma_intra_matrix; } - if (dct_dc_size < 0) { - av_log(s->avctx, AV_LOG_ERROR, "illegal dct_dc_size vlc\n"); - return AVERROR_INVALIDDATA; - } else if (dct_dc_size == 0) { + if (dct_dc_size == 0) { dct_diff = 0; } else { dct_diff = get_xbits(&s->gb, dct_dc_size);