From patchwork Thu Mar 16 05:32:58 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Wu, Tong1" X-Patchwork-Id: 40697 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:d046:b0:cd:afd7:272c with SMTP id hv6csp4010095pzb; Wed, 15 Mar 2023 22:36:39 -0700 (PDT) X-Google-Smtp-Source: AK7set/DOWP/3TXTZSIdbC0hfNZlaBfnTW/mqCUsb+H10wcGejIP29CMMCepzeteAYSQldSajwdp X-Received: by 2002:a17:907:d307:b0:8b1:7b54:a013 with SMTP id vg7-20020a170907d30700b008b17b54a013mr10436946ejc.57.1678944999226; Wed, 15 Mar 2023 22:36:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1678944999; cv=none; d=google.com; s=arc-20160816; b=VFl/MTJ3ai9jjg9JrFm+72IIsqisv44LWd4PUvrScq+hodpgN4LZCDt5xrOrSxT4YK DeM+/+qFQJ82cLytcGNPZ/M6jAx64sGih05cDEpF4GnbYnGZzTccPKtgzR+I8fmre0xW bsUOCAJg83gmPjjQ3W94Em+oPTAuADqrCnOEex1hCHLReAkAGtwPc9zoEtVEtYWFj0Q7 U69LuSzjNGfjjuzH+HfQsXUXFlpLiHg1p+AZ52xaDCqS/Th4dcQqQPx5WdmaObmdD0O/ sUYtDpI3jzt1rqBKQvduHbIS64EgXZztQU6dbITERnS4ETdpHE6w8gm57AySU8CtbF/L 1yIA== 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=XMB2IyH4Njy4Zj5KRUiF5qZeJNn/rO5HBEBYRC5VbpI=; b=DHhp9xVaVtNvVS4cIaPb6w/7y7Clmu6tjGtC34Yq54s5F3t/T65ssEbT7bQBgj92yx +WCTPwbxWb9keijxomGkaZNChob6rmvHLPHNUX5s2KboH6/D7q/7TJTEOz9nXv/qSbDu JA7ZgnlqPR1SPxYh7Qlf0SpbU0HINLsGgf2L34dmjLcYN3iO7av35Nx136UprLqFUGG5 XqBIh+lfSAjLaaFP1ulP6kbxuBtj0utFD87t2jZVYDA8PfdCMOg2cMqYYeMX7t2oGY+d +A1pL+L8x197GKlmlLlY2WZoBsjI7vyBZ8pviRAruoUaBOIoq48pUoABZnBi2KHxIi1E 5JCg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@intel.com header.s=Intel header.b=EQKjZVud; 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 o1-20020a170906860100b009232705db20si7193684ejx.515.2023.03.15.22.36.38; Wed, 15 Mar 2023 22:36:39 -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=@intel.com header.s=Intel header.b=EQKjZVud; 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 1D65668BE2C; Thu, 16 Mar 2023 07:36:35 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mga12.intel.com (mga12.intel.com [192.55.52.136]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id C63BF68BCDD for ; Thu, 16 Mar 2023 07:36:27 +0200 (EET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1678944993; x=1710480993; h=from:to:cc:subject:date:message-id:mime-version: content-transfer-encoding; bh=FvTkb2cxgpd5KTHT/hMvhqNFjxTfT0iq+TN1RxqS/LQ=; b=EQKjZVudZaHD6LJkkCgwtbWnKfv7zAnAYkA7t09EP6Dk+oUCbuzuBQv5 tbllS7ExCaq133GrTkTBv5je/IYdR5Ud1yOLHYrlv4C10YnUHCy9X4jOA KL/pBkQom23cFSnG32TOIbILUlSIh5TmGXd2MEXJ9EzD/lX8KK9UeF03e U4yp4lB+B2qcBFBirWOhQyJa0nF7AkQiwPiMPGKeeqac+zAsG9F+qXye5 LixXNQuno2Y4QTtHY+veHiMhscT3GHNalswRef8rKh2UbJ20a+PKLiNnI ujN9EkWX8hbFvkXGd7nJ24nDP3+KiSvAH6o/DidSw7treSXJflWQGA7yV w==; X-IronPort-AV: E=McAfee;i="6500,9779,10650"; a="317546162" X-IronPort-AV: E=Sophos;i="5.98,265,1673942400"; d="scan'208";a="317546162" Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga106.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 15 Mar 2023 22:36:25 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=McAfee;i="6500,9779,10650"; a="823090697" X-IronPort-AV: E=Sophos;i="5.98,265,1673942400"; d="scan'208";a="823090697" Received: from desktop-qn7n0nf.sh.intel.com (HELO localhost.localdomain) ([10.239.160.59]) by fmsmga001.fm.intel.com with ESMTP; 15 Mar 2023 22:36:24 -0700 From: Tong Wu To: ffmpeg-devel@ffmpeg.org Date: Thu, 16 Mar 2023 13:32:58 +0800 Message-Id: <20230316053258.265-1-tong1.wu@intel.com> X-Mailer: git-send-email 2.35.1.windows.2 MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH v2] avformat/mov: fix 2 compile errors 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: Tong Wu Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: f6PrS5Z9b3JF Compiler: MSVC 14.35.32215 Error type: error C2059: syntax error: '}' Related commit: 9e1ffed fate/mov: add PCM in mp4 test d7e8643 avformat/mov: parse ISO-14496-12 ChannelLayout Signed-off-by: Tong Wu --- libavformat/mov_chan.c | 2 +- libavformat/movenc.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/mov_chan.c b/libavformat/mov_chan.c index df17976e59..f3d51899e1 100644 --- a/libavformat/mov_chan.c +++ b/libavformat/mov_chan.c @@ -555,7 +555,7 @@ int ff_mov_read_chan(AVFormatContext *s, AVIOContext *pb, AVStream *st, /* ISO/IEC 23001-8, 8.2 */ static const AVChannelLayout iso_channel_configuration[] = { // 0: any setup - {}, + {0}, // 1: centre front AV_CHANNEL_LAYOUT_MONO, diff --git a/libavformat/movenc.c b/libavformat/movenc.c index 2ec575c954..68e7f8222b 100644 --- a/libavformat/movenc.c +++ b/libavformat/movenc.c @@ -1194,7 +1194,7 @@ static int mov_write_chnl_tag(AVFormatContext *s, AVIOContext *pb, MOVTrack *tra ret = ff_mov_get_channel_positions_from_layout(layout, speaker_pos, layout->nb_channels); if (ret) { - char buf[128] = {}; + char buf[128] = {0}; av_freep(&speaker_pos); av_channel_layout_describe(layout, buf, sizeof(buf));