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 91E1942CAE for ; Thu, 13 Jan 2022 01:55:52 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C2AF068AFE2; Thu, 13 Jan 2022 03:52:27 +0200 (EET) Received: from mail-qk1-f181.google.com (mail-qk1-f181.google.com [209.85.222.181]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9EEF368AFD0 for ; Thu, 13 Jan 2022 03:52:25 +0200 (EET) Received: by mail-qk1-f181.google.com with SMTP id z10so1200732qkf.7 for ; Wed, 12 Jan 2022 17:52:25 -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=8OikxSEejB8dOmmHl4ahpMyicDnXIGsT9+pjsJggERo=; b=eO42XGdau+i4JP9hr7eEz6y5Mt14PF1zoKjgSsT54gykLubeHWd/YUl2zTVUWPTPmc 57ugKCT+BsPTxrP8aShRhuf47+80BapHX0GBaS6u4pCTzBv85B1Z5YLAacW9gAJ3axGu bVMIQ7nLc5N5SZy2CYPq9Z0/2Ngcv4evJ/eLwNKUqt3b1DdsecO4Zgf8wzGEVtMXuUxw esEyeia2zX91JegKZ095AXpsMq/cUDqQujIBt/Ay11CHUslm5S9TiQhSc7X70JCSTRW+ 3uyWhmNqWAZdnRPXA5k3FyglQJUGcNVzsKcp5uwilI0Rb9oUXbupgW5lYBjIHBw3tEsu +olw== 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=8OikxSEejB8dOmmHl4ahpMyicDnXIGsT9+pjsJggERo=; b=exw3fUK4Le0aim9DJZkjiolJtz5ziFbODnkwn4HLRjo3SzHBI12Crw/TwtV4psbS6X XhrWsGPIDPuqGf6sRYZPqWbpjirvcmv2qx1yGEnMftbQ9lSMVgGq+F1Ce32nU8yP6vXp 7Eckdbt4zBpl7DkJtdsj54q32nPsTLR/RmrjjHG6ir7saqJ4mKJ3n/sjxm9+o8vIgKyK RHRpckGkPlkOyocLfmp0x5uyOMHRD2Z9ECvW86BIrgU0vpitSmDO89+uKt5rAOtDUMEi ewPp7GtDVeT6/uSC7N0jxpEr8cgYIflCtPVWAK3EkzT82AZbvTPZ5HSZx0xxR/JN+7iQ +5Ug== X-Gm-Message-State: AOAM531j66OCe4sldl+ur3opwPUuQ9sY5J+GON8WvAfL6OKN8IB2KXvr XXcV2J/Tnif1edHecRmoSuQmoxEmMG4= X-Google-Smtp-Source: ABdhPJxIVZRb0SsWWTaEXYz36NcL7SyirFhgtP1eVsjOKMnm50wN0qgYFOYjo6tKQLmzBibalemCnA== X-Received: by 2002:a37:6681:: with SMTP id a123mr1865073qkc.102.1642038743957; Wed, 12 Jan 2022 17:52:23 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id i21sm1204710qti.31.2022.01.12.17.52.23 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:52:23 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:49:42 -0300 Message-Id: <20220113015101.4-21-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 020/281] afc: 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: Anton Khirnov Signed-off-by: James Almer --- libavformat/afc.c | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/libavformat/afc.c b/libavformat/afc.c index 102b74baeb..898c7d03eb 100644 --- a/libavformat/afc.c +++ b/libavformat/afc.c @@ -38,12 +38,11 @@ static int afc_read_header(AVFormatContext *s) return AVERROR(ENOMEM); st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->codec_id = AV_CODEC_ID_ADPCM_AFC; - st->codecpar->channels = 2; - st->codecpar->channel_layout = AV_CH_LAYOUT_STEREO; + st->codecpar->ch_layout = (AVChannelLayout)AV_CHANNEL_LAYOUT_STEREO; if ((ret = ff_alloc_extradata(st->codecpar, 1)) < 0) return ret; - st->codecpar->extradata[0] = 8 * st->codecpar->channels; + st->codecpar->extradata[0] = 8 * st->codecpar->ch_layout.nb_channels; c->data_end = avio_rb32(s->pb) + 32LL; st->duration = avio_rb32(s->pb); -- 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".