From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.ffmpeg.org (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 3EF614AA5A for ; Mon, 23 Jun 2025 05:29:13 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id 75BD068E8B0; Mon, 23 Jun 2025 08:28:58 +0300 (EEST) Received: from mail-pl1-f177.google.com (mail-pl1-f177.google.com [209.85.214.177]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id E344368E72B for ; Mon, 23 Jun 2025 08:28:51 +0300 (EEST) Received: by mail-pl1-f177.google.com with SMTP id d9443c01a7336-22c33677183so33300925ad.2 for ; Sun, 22 Jun 2025 22:28:51 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750656530; x=1751261330; darn=ffmpeg.org; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:from:to:cc:subject:date :message-id:reply-to; bh=ys5RKeDRtDzaJ9Ve5WRFqHRYGRCVrwzIJQDRmAWUYsU=; b=NLd6RaJ/QEWWSsYhUuyCNnm+4Zqk0q6A4qY5P/DeLS1Lrxh8albneAMZbdab2L/fwe JU+KSMo7gvUVR6Gka6yNzGeJYXem16oliOZCcjAdsm0rUhXzOFgxtZU+bnc+T4LW0c5F ffJGxn413v5TnXNcPA04ZwL1n+UNiUzznLt8ptQ7Cykf0mJBPsIacQp5LbpJVaoxyALv P5nb37paayqIL+00RIIom09HcwOC/StlCr/BYL9yRjUs4KK1bAzBwtQOBBszMpsLDqgp I6yreUYchfr8fF7dtvoRo39vXoGb1Jxw7kMyAX2idPbiNQa9U+Vm4BYh9FIocicdAaMS oHIA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750656530; x=1751261330; h=cc:to:mime-version:content-transfer-encoding:fcc:subject:date :references:in-reply-to:message-id:from:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=ys5RKeDRtDzaJ9Ve5WRFqHRYGRCVrwzIJQDRmAWUYsU=; b=AH/MNrw3HyivOBIUBsEwMIHDW2KRLLzN8VxlIJaDX3ffrswRRTwhsoPT0gtm4SXZUB sd1FKZgFVXZnZHxVAqKuS+Y9+dCgexzsp2zYH9mcaMNHBaxn1GrLvrbqdljHZfCgEg6r EZsYkE1XWA1holjV7RtjL/WSqqK6gjeiLZzKOfbFU8XTWQ45oVe1De3LAXbXIr8mB5Pv LWk9q1ELMiLbZq6NCtt0Uf6i4oDL8JQj/7BMm6GdKS7C/XQ+bvEqVkRu49WHC0+rPdm+ 7m9wj7MjwGTGwiCxb1NTyFRFq2pOPRGRMtJDp12yRH4RT4FGqtAVnpXkXP37Bq2TZ0kF fxEw== X-Gm-Message-State: AOJu0YxFMQhYD+JsyIAWQF69JODcV8E67ngiu8xBOesW3Uq4TdbNVD+j dBMhC+TAm0GW1j6Tkhdgr4WkJ9W0Zdy2HjMs7I/88JitlDEyQ9s1Rs4wZWxqcw== X-Gm-Gg: ASbGncsDOejnFn3F8t36ALGRyzQfgoqPCHCbYKx/pZ9C2T5CLJlCIM41rcRoUpb6TAr OWMBlAh3sus2J33brCQIu6n2kzO+QZQ0ajQk2FDgcTUGc1tRjLPlyb2JBX7JW97R2e8VxS7hKC9 IOYZRVXGXYo2OUmOMIZejzG/z1/xvZbIvtXEU7Y6ZHL7OmnvHQzv6ATaXGv0iYx//LnrLyI4OCw 4w3wbSyzchSg6Vp9Z0mjsxEF4bmzwAzVzlj4mtXXTzAkplpZse1RJ2P1LglpECT3EYLzj7PLMJh IBGlyGiOfk1mEUg4Ne1yalsZD3XIy48PEmDYx5kkz899aUR8YOD0df8/yuLEa7j4+ZhGjWeN1Na 2AvNdH4lN8gkRZYxC7JmGgqLRglI= X-Google-Smtp-Source: AGHT+IHDAiD2AyBK/759asdLVmJXFcZLcH0AUvbKe7ZPfqKZaZkuv1sUAX1KnDR4O8wa2eQ6mzN4HQ== X-Received: by 2002:a17:903:1aa7:b0:234:8a4a:adad with SMTP id d9443c01a7336-237d98f9968mr179760245ad.26.1750656530012; Sun, 22 Jun 2025 22:28:50 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-237d87182c8sm74223945ad.232.2025.06.22.22.28.49 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Jun 2025 22:28:49 -0700 (PDT) From: Andreas Rheinhardt X-Google-Original-From: Andreas Rheinhardt Message-Id: <08f411de2cda37dbce842b5e083c201897d8e79a.1750656512.git.ffmpegagent@gmail.com> In-Reply-To: References: Date: Mon, 23 Jun 2025 05:28:29 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 2/4] avcodec/wma, wmaprodec: Remove always-false checks 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 Cc: Andreas Rheinhardt Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: From: Andreas Rheinhardt None of the codecs used here has the AV_CODEC_CAP_CHANNEL_CONF cap set, so the sample rate is checked generically. Signed-off-by: Andreas Rheinhardt --- libavcodec/wma.c | 2 +- libavcodec/wmaprodec.c | 5 ----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/libavcodec/wma.c b/libavcodec/wma.c index 257184c0d8..31a422ee27 100644 --- a/libavcodec/wma.c +++ b/libavcodec/wma.c @@ -86,7 +86,7 @@ av_cold int ff_wma_init(AVCodecContext *avctx, int flags2) int sample_rate1; int coef_vlc_table; - if (avctx->sample_rate <= 0 || avctx->sample_rate > 50000 || + if (avctx->sample_rate > 50000 || channels <= 0 || channels > 2 || avctx->bit_rate <= 0) return -1; diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index 44e5da08ab..7f3dc7fd8b 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -471,11 +471,6 @@ static av_cold int decode_init(WMAProDecodeCtx *s, AVCodecContext *avctx, int nu return AVERROR_INVALIDDATA; } - if (s->avctx->sample_rate <= 0) { - av_log(avctx, AV_LOG_ERROR, "invalid sample rate\n"); - return AVERROR_INVALIDDATA; - } - if (s->nb_channels <= 0) { av_log(avctx, AV_LOG_ERROR, "invalid number of channels %d\n", s->nb_channels); -- ffmpeg-codebot _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-request@ffmpeg.org with subject "unsubscribe".