From patchwork Thu May 9 02:28:18 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hiccup Zhu X-Patchwork-Id: 48681 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:9d8e:b0:1af:cdee:28c5 with SMTP id mu14csp161773pzb; Wed, 8 May 2024 19:28:38 -0700 (PDT) X-Forwarded-Encrypted: i=2; AJvYcCWDY+0PC+YgU9WeTnphNyVqUtqM3UjDf0gQycysbr1i8gxP8mSXGjc6FtE7Ug26Wrw0IyXdUG8eKWjlfr7aF+vRtYUycx+MbOJXnQ== X-Google-Smtp-Source: AGHT+IEvRZJyiWhtKDvXR3wy1l92s9CGF+alx25HiabfsU9OUeYz8MwhsTPV9FMrxMGHHD4YL1hh X-Received: by 2002:a2e:9f54:0:b0:2e1:ff62:d92 with SMTP id 38308e7fff4ca-2e4b179170emr3691051fa.19.1715221718272; Wed, 08 May 2024 19:28:38 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1715221718; cv=none; d=google.com; s=arc-20160816; b=xVDDsZe4buHf/EgqgVESa54Mp6GOD11JQXMOSEJVdraV0i+VUG+y2ZMv9/hAn9H+Wx 4Bzey6q+vvpQHENO/zNJQpvsi/vLegkSgYDlrNJPCnsrfgzZ/K7oz3IV8RnGsQhYKs8c Wucto3FTJl/4VwoJnxeZNPhVNhTyoTzUPi4slLRl6e+2Egzbb6lBZ1Th5uHZpOxKxBdR 9iGfgRM46kDEJBCaLYaoz+mVfqk2iJQXNvYPGX8o7Se9KTzgGdtdm4gmCKQLiKDzJNx1 NO1X5vaYqkLxoEKH09g0PXUx0lDOBDZxJp1QCIm5Y+KCE5F/90fN8oMVef7ADoyolNw1 LvGg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc:reply-to :list-subscribe:list-help:list-post:list-archive:list-unsubscribe :list-id:precedence:subject:mime-version:message-id:date:to:from :dkim-signature:delivered-to; bh=R9ljgJ/Z7wi3eJPiDe3m2i+7LZDu2lgQBIzdGr4by5c=; fh=mx15VVhTySSwv5/fD/XOnO0a2/rr2FlHqAiq9FcS3P0=; b=yqaQJNlHH8vv9p9t/mD/COFj4Neg2Mq0edAUNq3fpAQv35I7qupgYFaGBssfjXVsh3 cjVo1jQe1LzoPsEFlCNXgyMpFkL7Bim6s6Eeani4zUgIY6h+BQQjPqwRE+Msj8yQD7oH jFU3e/novYqgv4FYBdVnQrXXTAo8L29EBWTgUhnzNUGCrN66Gm8kPCE7jnrxOHLCwh1+ CvveC4GffsWSdU4m3klT1S/TS3h2mb7o34Fp6+cCzFwjDaYIECzp0lKUHWLWlHpJG7ZB LUaPMwfzSnLF1ZufEEXC3IpOWTiE7jyuBVMVtLlykzXTt6uDOkvR/akgShe4cwca/1o5 0m9w==; dara=google.com ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20230601 header.b=PRei7Nki; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id 38308e7fff4ca-2e4d15195d4si896301fa.224.2024.05.08.19.28.37; Wed, 08 May 2024 19:28:38 -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=@gmail.com header.s=20230601 header.b=PRei7Nki; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id D772B68D70C; Thu, 9 May 2024 05:28:33 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-pl1-f180.google.com (mail-pl1-f180.google.com [209.85.214.180]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CE17B68D63F for ; Thu, 9 May 2024 05:28:26 +0300 (EEST) Received: by mail-pl1-f180.google.com with SMTP id d9443c01a7336-1ee12baa01cso2562185ad.0 for ; Wed, 08 May 2024 19:28:26 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1715221704; x=1715826504; darn=ffmpeg.org; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:from:to:cc:subject:date:message-id:reply-to; bh=FfR9cfk2NfQzYjyM3NLODlWIiMMkQ3Nat2JVj+rHh1Y=; b=PRei7Nkix7vgLFdtxvkbafZAdlSqT/ZTibwKnQleFqcQ8WnOQfoPtArzWMKY+eT5Ef ihosLqTFavAksPK92I0EzLps0/abu1zBrmN4PM+BIWFgpSGQccbwdg5sXvoJXS/s1mHn w+A9sxPIngyyaLVTM799JMSTSni8Kw3C8T66bArU3656G8iylhTKyIscmjQOSWaNh/5r HmEu8xeGQLYO/Xh/PeAo4yfGPWoUPLLIx7hglaiss+HC2go7MZCVjuXmFratxJwiQbLr VLeP29z1j2tTdl9sq7w4N3yrrc5yHUxEAITKel5nbpbCFI0PmPhmggRHiDNaoF6nP3Mr yLWA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1715221704; x=1715826504; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=FfR9cfk2NfQzYjyM3NLODlWIiMMkQ3Nat2JVj+rHh1Y=; b=Zbu+biAI242X4GnFMZBhKW4If+qZepPEcKxaKV5lmryJxCrrnZKl3geZ77aX3O0I/s 2Z4kz+CMxRdcioNhwTjaa/MLOOA7FJYVj9ZSaZsJjBlHJcbdwPzznOh7C/zPXB2a444/ nt0mEssBeY2PAF1SBJFZ9tGOtr1QggGftAgPX6vln849OgcTEHatMmSx5qmx/+cRBEPd X2Bwor6953nVPNy85APNAJtow2F+oV+6iR4EIhJ0Ygcj48FLHbk7WIBzqZoA3UlwAqdg isNMUBPc0AUbTUKpOtn77L84wCTPZvF3Lp96byyqb0BD6qG+o27x3agTTnycMfaGL8eS 5x7A== X-Gm-Message-State: AOJu0YyJM5ifEerWrhNPot8NSmXx8wHMW4GAAh7BPEi7VyNqAdq6hhtp QHZ/zDTcTL+o4jWLFlSwVwc08lKhLkPzIAIK9UA7PumNYVOF6S2cTy2LQg== X-Received: by 2002:a17:902:7898:b0:1e0:bae4:48f9 with SMTP id d9443c01a7336-1eeb0697daemr41740545ad.32.1715221703937; Wed, 08 May 2024 19:28:23 -0700 (PDT) Received: from PC.mioffice.cn ([43.224.245.231]) by smtp.gmail.com with ESMTPSA id d9443c01a7336-1ef0bad7e97sm2442405ad.95.2024.05.08.19.28.22 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 08 May 2024 19:28:23 -0700 (PDT) From: shiqizhu To: ffmpeg-devel@ffmpeg.org Date: Thu, 9 May 2024 10:28:18 +0800 Message-Id: <20240509022818.132382-1-hiccupzhu@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH] avformat/riffdec: add ch_layout used av_channel_layout_default. 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: shiqizhu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: L2Ox3qeHcKIU Signed-off-by: shiqizhu --- libavformat/riffdec.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/libavformat/riffdec.c b/libavformat/riffdec.c index b7a85a6ab2..89267e879d 100644 --- a/libavformat/riffdec.c +++ b/libavformat/riffdec.c @@ -197,8 +197,7 @@ int ff_get_wav_header(void *logctx, AVIOContext *pb, /* ignore WAVEFORMATEXTENSIBLE layout if different from channel count */ if (channels != par->ch_layout.nb_channels) { av_channel_layout_uninit(&par->ch_layout); - par->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; - par->ch_layout.nb_channels = channels; + av_channel_layout_default(&par->ch_layout, channels); } return 0;