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 B599F4F792 for ; Mon, 23 Jun 2025 05:29:35 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTP id BD64E68E934; Mon, 23 Jun 2025 08:29:08 +0300 (EEST) Received: from mail-pl1-f171.google.com (mail-pl1-f171.google.com [209.85.214.171]) by ffbox0-bg.ffmpeg.org (Postfix) with ESMTPS id EA9B668E925 for ; Mon, 23 Jun 2025 08:29:02 +0300 (EEST) Received: by mail-pl1-f171.google.com with SMTP id d9443c01a7336-23633a6ac50so51448245ad.2 for ; Sun, 22 Jun 2025 22:29:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1750656541; x=1751261341; 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=Im9JsBmd2ll8/EN80z6UKioZ8kUsFFvT5nCQ6btYN40=; b=DZ0TtGKZDUGLAnyf3w9KRFRap9DQ6ZBFaANwGL2rIS3v5FwNzilLSGkAzezEcIn6KK +P7zvL9DJYNAwFznCW7HTZpjDVQhREVG44Avn6crF28nucgn0Z/WZeYkHFHQfvkt3bno Jo2raL9CbFISOoyGkcpG367FttWjoRBapmLQfWV4A3M60BjXI7iMlWidXeWhMa1qzAaO npOIbs+UUbhVP5gsGLE766TU29DFFMhGQGk4wM5+sfTqRC6EqyYaxZ6sCs7YQJ3YsRPi +btlrX1rp6c0TzvFoKe4fvVAG4qRWwHJHmaJfWsXuhhbTV6LhdkvCECa7wv459beqIr1 j0Ig== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1750656541; x=1751261341; 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=Im9JsBmd2ll8/EN80z6UKioZ8kUsFFvT5nCQ6btYN40=; b=cJm3Dw6UpHzyjFwMUtuVqFnl0DMnj6131IVvDfHX5PMRXwTNkdi2LEH2OBhmopyDpK zVFQ4dwpqbg1iIIGE7AIUVOzQKIXpbG2JFDdglTTr8GOEdhckyZAuYCFs0hLu3txxuSq QrP2JF9NOiIG00X+BKxP4UREXy/ueBbWCcl10nAbxfpokF+g8oYfjxCo2CovW/Zo4sq+ Hz67DUswwF4kblTGlVCz5dSRz+8gbrYTHUL0sLpQexmaKFt7ln/tHcYyXnHXxek77UC/ gYqL9tOcSy47PnUDwm955dRWyTG3jbKbLlTNKvzlcOUcFeBsWPc0i9d+2RQ/+9hg/bz6 wGMw== X-Gm-Message-State: AOJu0YzikocFxnEkJXEbzdF4/LKY0W95rlKjdZaRLBezOTK2eeAuyRBZ GKgBlGzoBFkEQ8Mp2de5JXhIbQBHk47rH/NnjXTAze9wzJMGYk+gaEFOcGWvUw== X-Gm-Gg: ASbGncsncpCGMiOsEsU7zwIZM2e7/QWsLuhTfPDcH5zQywO8/nMMKcCDE9jjWsgrha+ i6P5GM0nGMAH60f2Arde4/wnMAgs0R8+7GeXhas8mzLxyPjDB3Mfyp8sjy7E8sZixzhlZ34+or6 bFP4JskItD62gK2NWHMv8TfK9cwNmDMFvSOM3uMKidbw/XrYRfp7xKLXEnXQ4nYAJyeDWo+zunz AW2t8bKBApokahdjl6zAsOqZjLb/oRY67f+fnvvYXbgn19Dmgjmm3CtuEz055uwz3PowHw9eDRL WiELfvhN71iZCHdmrTG53MS8oLLguhvB7Fxa+AOz+gzXJ3h64P8L7zM6dpViLX3woU+7rt+JWhk LGXew2GETGL2PoJpd X-Google-Smtp-Source: AGHT+IHvuw3EXxY43SxIz3j37O7D2b2rEcG5AvU3IUsoIhVI8kGgFgIuUPQJq0q7sBSsxYg3udkDzg== X-Received: by 2002:a17:903:2f0f:b0:234:8e54:2d53 with SMTP id d9443c01a7336-237d99815bamr160281265ad.45.1750656541334; Sun, 22 Jun 2025 22:29:01 -0700 (PDT) Received: from [127.0.0.1] (master.gitmailbox.com. [34.83.118.50]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-237d861061dsm72534465ad.118.2025.06.22.22.29.00 (version=TLS1_2 cipher=ECDHE-ECDSA-AES128-GCM-SHA256 bits=128/128); Sun, 22 Jun 2025 22:29:00 -0700 (PDT) From: Andreas Rheinhardt X-Google-Original-From: Andreas Rheinhardt Message-Id: In-Reply-To: References: Date: Mon, 23 Jun 2025 05:28:31 +0000 Fcc: Sent MIME-Version: 1.0 To: ffmpeg-devel@ffmpeg.org Subject: [FFmpeg-devel] [PATCH 4/4] avcodec/wmaprodec: Avoid branch for setting block_align 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 Signed-off-by: Andreas Rheinhardt --- libavcodec/wmaprodec.c | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/libavcodec/wmaprodec.c b/libavcodec/wmaprodec.c index 7f3dc7fd8b..d87ed0433e 100644 --- a/libavcodec/wmaprodec.c +++ b/libavcodec/wmaprodec.c @@ -370,14 +370,6 @@ static av_cold int decode_init(WMAProDecodeCtx *s, AVCodecContext *avctx, int nu int log2_max_num_subframes; int num_possible_block_sizes; - if (avctx->codec_id == AV_CODEC_ID_XMA1 || avctx->codec_id == AV_CODEC_ID_XMA2) - avctx->block_align = 2048; - - if (!avctx->block_align) { - av_log(avctx, AV_LOG_ERROR, "block_align is not set\n"); - return AVERROR(EINVAL); - } - s->avctx = avctx; init_put_bits(&s->pb, s->frame_data, MAX_FRAMESIZE); @@ -603,6 +595,11 @@ static av_cold int wmapro_decode_init(AVCodecContext *avctx) { WMAProDecodeCtx *s = avctx->priv_data; + if (!avctx->block_align) { + av_log(avctx, AV_LOG_ERROR, "block_align is not set\n"); + return AVERROR(EINVAL); + } + return decode_init(s, avctx, 0); } @@ -1957,6 +1954,8 @@ static av_cold int xma_decode_init(AVCodecContext *avctx) XMADecodeCtx *s = avctx->priv_data; int i, ret, start_channels = 0; + avctx->block_align = 2048; + if (avctx->ch_layout.nb_channels <= 0 || avctx->extradata_size == 0) return AVERROR_INVALIDDATA; -- 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".