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 ESMTP id DF1AC42E32 for ; Thu, 13 Jan 2022 02:29:32 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0D81268B508; Thu, 13 Jan 2022 04:01:32 +0200 (EET) Received: from mail-qt1-f174.google.com (mail-qt1-f174.google.com [209.85.160.174]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 22BD768B4F6 for ; Thu, 13 Jan 2022 04:01:31 +0200 (EET) Received: by mail-qt1-f174.google.com with SMTP id bp39so5318731qtb.6 for ; Wed, 12 Jan 2022 18:01:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:subject:date:message-id:in-reply-to:references:mime-version :content-transfer-encoding; bh=k5L9S4JdRUCMD6pAF4b+3VZwc1DSAUnxZNR4S8uRkbk=; b=hfUdc0gq3zr6X477W5fLG/3gvh6HObS31+VlhkoMcoIknSuqL60elHUq1i4ZguwwZi E5uWSm243Xm/DHd2zzi4FO9urOO6frNR8qYS5zb83FTqurDBPtatecyoHRkxeHbo7NjC RJhhIpf9la3oUtU2PZl9ldcQ4oY4dMtz5UEiE/BBFhCrsG3NVlmfpd3s16fFcqos+IuS UiDwwUuwQW8X6PNu8FmT+ft9S+L33t7RFevwoa5m3bjbvygfHVz056WyZQGxWc5R3DMR ePAIaG6aX6mns7F0eKYXMwlRwEdm/j91ARmhQjGRzWxRCzGYXEbj19hTpNWDlo8s996j +lzA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references:mime-version:content-transfer-encoding; bh=k5L9S4JdRUCMD6pAF4b+3VZwc1DSAUnxZNR4S8uRkbk=; b=XNKFRLzqvLavMMiXy1OZY4cDaWS+8WOF6IMY1gz54sTFtXTUu6YH2MDTCAfgxcNCQc fNbC+pQzpiQeUn6OJ+EneMoB0XEDq8bLdoqeSpzjMyoSd+O2RuioplM8bVoj8a4BG2KC N/6SdS3098/CpoxdhcL1BJZmjwNhE/adxMmuejDMK1CE1CYsRF11+71xsyr98wiqExpG XbNwWwwh06HfxDEKG3+YtNkp1pZdPax89xq9Tr8hxlxSukKYARrModLcgrr0P4L3pPjL B9qyBZhKDws47vihstRVOaRQGJhrjqYUt8/Qhl+b+zlh+Crn++Mk5mQ3e7CV+qiIYtW1 1BdQ== X-Gm-Message-State: AOAM532/kHu2DlwlzZpVqWk4OAbqfeSIGi+RvxNWjjf7ew0lan49lhY3 wRLvXJ8SUmYMc1qEI2nt3HvuRScKPw8= X-Google-Smtp-Source: ABdhPJz6GJeLRqRfNNQOAkSwhDN9MhpJ4+4OpAjnAPKvGrWYyrVT0jCOjRxemd3JkqsQ+Mnfmbnmxg== X-Received: by 2002:ac8:5c50:: with SMTP id j16mr2002089qtj.255.1642039289695; Wed, 12 Jan 2022 18:01:29 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id y17sm1182232qtj.75.2022.01.12.18.01.25 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:01:26 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:00:15 -0300 Message-Id: <20220113020026.590-20-jamrial@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220113015101.4-1-jamrial@gmail.com> References: <20220113015101.4-1-jamrial@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 168/281] wc3movie: convert to new channel layout API 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 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: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/wc3movie.c | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/libavformat/wc3movie.c b/libavformat/wc3movie.c index fe2d0d4245..8f5c2f18cd 100644 --- a/libavformat/wc3movie.c +++ b/libavformat/wc3movie.c @@ -54,7 +54,6 @@ /* always use the same PCM audio parameters */ #define WC3_SAMPLE_RATE 22050 -#define WC3_AUDIO_CHANNELS 1 #define WC3_AUDIO_BITS 16 /* nice, constant framerate */ @@ -195,13 +194,12 @@ static int wc3_read_header(AVFormatContext *s) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_PCM_S16LE; st->codecpar->codec_tag = 1; - st->codecpar->channels = WC3_AUDIO_CHANNELS; - st->codecpar->channel_layout = AV_CH_LAYOUT_MONO; + st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_MONO; st->codecpar->bits_per_coded_sample = WC3_AUDIO_BITS; st->codecpar->sample_rate = WC3_SAMPLE_RATE; - st->codecpar->bit_rate = st->codecpar->channels * st->codecpar->sample_rate * + st->codecpar->bit_rate = st->codecpar->ch_layout.nb_channels * st->codecpar->sample_rate * st->codecpar->bits_per_coded_sample; - st->codecpar->block_align = WC3_AUDIO_BITS * WC3_AUDIO_CHANNELS; + st->codecpar->block_align = WC3_AUDIO_BITS * st->codecpar->ch_layout.nb_channels; return 0; } -- 2.34.1 _______________________________________________ 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".