From patchwork Sun Jun 30 23:12:50 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Michael Niedermayer X-Patchwork-Id: 50230 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a59:cc64:0:b0:482:c625:d099 with SMTP id k4csp1462564vqv; Sun, 30 Jun 2024 16:22:53 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCVO/Mw5QGZsgwfYsPa6bNCtKvUJTFeN+sCmYZiU4L+LcMcRq19X8YLNevXbVSM2VxcIx7/k9YqZ5N4lWXaWyL1emJBynZ8H3dWcmg== X-Google-Smtp-Source: AGHT+IFQpKWLoFSM911mHctfhD2MpZ1imIJ4ie3z8g2BfW6K+kzpztqmUiOPQiqK5OF4xU+gCjeS X-Received: by 2002:a05:6512:230b:b0:52c:dff5:8087 with SMTP id 2adb3069b0e04-52e826fc218mr2538347e87.51.1719789772784; Sun, 30 Jun 2024 16:22:52 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1719789772; cv=none; d=google.com; s=arc-20160816; b=xeAmDyYIGVLaXs4Up0lj/fOk5tAKfpZuhaTLuPSNXvtseqKL0+Wp0P4HB70e/rC90J +eQOkoY2FC5OqRJ8a/yzpoQ/HwaC6U9ma2AIFrpB9ujQi0chwzEDmb2A/c1PkAdLZW+i PwQLAbdIBBz6NrxqC+mq0Nu7ddGwFd72zTxBACjBegdlWYWE/oEIdRCnbVbBVc5WYGpF rxsDdcduFNX13uk4VQjBxb5SAuVKJJWSSwZnytvxG9LtLkU89o8Q0Eet2Q5orRQXVDpv 3DeHapy6bhNkkIMQZypgWBX9IS+fR+0j9X+0F0Jtu97iSD18xu51TBTyASkghMExVJyH a/Uw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=zWlItbo3QSa59vu82qAixFNzN0UAG8+mHGEQmq62404=; fh=e5zN9xSzcxLA6bGo3lF+CqTbY/oLwzApV03EO/RBfgQ=; b=p//zrlzINQUsbV//z+KGWyk5asHgD4b8FvCRRMn8WOP/7cms4DBsqI9vm3gyaAP4i9 KUHpIlOJkk22dZ672C4R78A5x5O/vaCFhQK0WU54BXF3E8ApVa8qlk1o7NvDY/IFWlbo 2a0RfrkG2xGnrFSu3PbRteltoVNrulzumHMa1t5iJfZd5fZVU8iU+rpVBwePzQ+oB8sJ +ZC2Mf5xK6f/EEM7RoEy+G+iIKDsIYjsHWxdhqi0udGjihfbfNpNKtyjbC0CfKAHSEc6 vAFljyaIw/Jr/pQtZJsKyHyDpyFPyb+D9+xjEwTWjMBwHAfPprxM3FdfcjgfsbmTLqqt grAw==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=Ay9jGV3b; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 2adb3069b0e04-52e7ab31651si1910003e87.461.2024.06.30.16.22.52; Sun, 30 Jun 2024 16:22:52 -0700 (PDT) Received-SPF: pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) client-ip=79.124.17.100; Authentication-Results: mx.google.com; dkim=neutral (body hash did not verify) header.i=@niedermayer.cc header.s=gm1 header.b=Ay9jGV3b; spf=pass (google.com: domain of ffmpeg-devel-bounces@ffmpeg.org designates 79.124.17.100 as permitted sender) smtp.mailfrom=ffmpeg-devel-bounces@ffmpeg.org Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 7023F68D766; Mon, 1 Jul 2024 02:13:41 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from relay5-d.mail.gandi.net (relay5-d.mail.gandi.net [217.70.183.197]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id A3B5B68D6E0 for ; Mon, 1 Jul 2024 02:13:18 +0300 (EEST) Received: by mail.gandi.net (Postfix) with ESMTPSA id 084501C0005 for ; Sun, 30 Jun 2024 23:13:17 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=niedermayer.cc; s=gm1; t=1719789198; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=9FOa4y7jmjVD0zgFR3mnnL5/n9r+8wkp4hsWvXAcp9o=; b=Ay9jGV3ba/jfXT9E3VGro3ekP6PD7Lw37V5EB7MHy1ofGlMxLEtVls89evp72tH+lC9Doo 0c2mXgO8M1jTw2dHmW1/9QJHuw7DP3X3jVei9mzzRTzXmvHajWpeDzuEwK7uEkam8dbYdM hga211qMN7p+8DpkCBOW/F1fJalVYwzHM2KYDAD+tsAOcLtmOGjHh39ubOv/pc/YPjMQF1 rlNuBWtjd+TPRVfUcRnl+nvYPcAU/h1agJ8PdHbcc9i1ZAJEB6ROe+2FSYq0Wq/RVkIaXr cyHCevYy5pAvw6LAlx7d29dybgfcvcqd9RbQstWrJkB1AMEGYIgYhyoO9FxclA== From: Michael Niedermayer To: FFmpeg development discussions and patches Date: Mon, 1 Jul 2024 01:12:50 +0200 Message-ID: <20240630231306.3779027-11-michael@niedermayer.cc> X-Mailer: git-send-email 2.45.2 In-Reply-To: <20240630231306.3779027-1-michael@niedermayer.cc> References: <20240630231306.3779027-1-michael@niedermayer.cc> MIME-Version: 1.0 X-GND-Sasl: michael@niedermayer.cc Subject: [FFmpeg-devel] [PATCH 11/11] avcodec/aac/aacdec_usac: Remove check for impossible sbr_ratio X-BeenThere: ffmpeg-devel@ffmpeg.org X-Mailman-Version: 2.1.29 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 7kBXxjw+ofpi Fixes: CID1605475 Logically dead code Sponsored-by: Sovereign Tech Fund Signed-off-by: Michael Niedermayer --- libavcodec/aac/aacdec_usac.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/libavcodec/aac/aacdec_usac.c b/libavcodec/aac/aacdec_usac.c index 9587348021e..10121dbc34f 100644 --- a/libavcodec/aac/aacdec_usac.c +++ b/libavcodec/aac/aacdec_usac.c @@ -1676,9 +1676,6 @@ int ff_aac_usac_decode_frame(AVCodecContext *avctx, AACDecContext *ac, } else if (sbr_ratio == 3) { ratio_mult = 2; ratio_dec = 1; - } else if (sbr_ratio == 4) { - ratio_mult = 4; - ratio_dec = 1; } else { ratio_mult = 1; ratio_dec = 1;