From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org [79.124.17.100]) by master.gitmailbox.com (Postfix) with ESMTPS id 7D2DA4BAF6 for ; Mon, 28 Apr 2025 06:58:51 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CA9A768B37C; Mon, 28 Apr 2025 09:58:47 +0300 (EEST) Received: from vidala.pars.ee (vidala.pars.ee [116.203.72.101]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 468EE687D0F for ; Mon, 28 Apr 2025 09:58:40 +0300 (EEST) DKIM-Signature: v=1; a=rsa-sha256; s=202405r; d=lynne.ee; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1745823519; bh=JSIKDm8mkAlOieftDB3Q2HS PHdBWMnHPxUaLCulaffM=; b=TtnZmdWnRX8j8Ra4dCf52IM6vSZxA3zG4PPIGuqI6VPSs7fGIm Hme0fVfn+Prgs9MY0JZdw/tZRYyNam7IqiQl3Rri75w/f9mVnNrNSh+Yf+aMs48/6S1+zXYMgYn mvh7wPCorw7xEgnTgVZ+4MIdhN7Y/Rdz54Ka5R4AfBBV7PLQSjSpaFCPRZVulUWgMxYz7Xa3VEy PwuuNmv84HSJCSUoFGFKNUrOHNZpr4xW2cnFLb7cl6rvYX59qew4rSUuKQoomItEhlSVBf1yxWH bYhz/v0PbHMMBHow7aLGWi4AIxxZqQTVCiTKGZzID66mqFvjROGhZODwwuoPLcKocdQ==; DKIM-Signature: v=1; a=ed25519-sha256; s=202405e; d=lynne.ee; c=relaxed/relaxed; h=Message-ID:Date:Subject:To:From; t=1745823519; bh=JSIKDm8mkAlOieftDB3Q2HS PHdBWMnHPxUaLCulaffM=; b=Jxob7s6dMRpEpJICRBdPBxIEFTdV3fL3gYjxJToHXqGMf7xS5d XVpX4O3bS3jMywEDlbOsnn/5mLQT+VQvUyCw==; From: Lynne To: ffmpeg-devel@ffmpeg.org Date: Mon, 28 Apr 2025 08:58:29 +0200 Message-ID: <20250428065838.64188-1-dev@lynne.ee> X-Mailer: git-send-email 2.49.0.395.g12beb8f557c MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] aacdec_usac: correct Mps212 parsing location 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: Lynne 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: It gets parsed after SBR, even if there is no SBR. --- libavcodec/aac/aacdec_usac.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavcodec/aac/aacdec_usac.c b/libavcodec/aac/aacdec_usac.c index ccdf58bc8e..ef0c115aa0 100644 --- a/libavcodec/aac/aacdec_usac.c +++ b/libavcodec/aac/aacdec_usac.c @@ -1478,11 +1478,11 @@ static int decode_usac_core_coder(AACDecContext *ac, AACUSACConfig *usac, ret = ff_aac_sbr_decode_usac_data(ac, che, ec, gb, sbr_ch, indep_flag); if (ret < 0) return ret; + } - if (ec->stereo_config_index) { - avpriv_report_missing_feature(ac->avctx, "AAC USAC Mps212"); - return AVERROR_PATCHWELCOME; - } + if (ec->stereo_config_index) { + avpriv_report_missing_feature(ac->avctx, "AAC USAC Mps212"); + return AVERROR_PATCHWELCOME; } spectrum_decode(ac, usac, che, core_nb_channels); -- 2.49.0.395.g12beb8f557c _______________________________________________ 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".