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 671A342E4F for ; Thu, 13 Jan 2022 02:26:21 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id C94E968B47B; Thu, 13 Jan 2022 04:01:14 +0200 (EET) Received: from mail-qv1-f51.google.com (mail-qv1-f51.google.com [209.85.219.51]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5A44968B45C for ; Thu, 13 Jan 2022 04:01:11 +0200 (EET) Received: by mail-qv1-f51.google.com with SMTP id hu2so5095085qvb.8 for ; Wed, 12 Jan 2022 18:01:11 -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=OxBB94zUrGR4KD3J06IO29Vjh8SkXb6HRPdmx2SFVtY=; b=O7o3aQCV108nD9N2WEt510hJsQlnNWshXXztO7XKlxdzLvAcWn5HLYt/Urgp+ovW2O 3MBRa4bvf7jw3QjF0M8pKRH4545BVxYrPXOoEq0QD6YrN3oBRC3XNkPtWw1Y3cUxEH9r zWm1eoXtd+FC2X0umdF62tww7gR71SwvGd/u4M6OJP4EX6I3TcloRRT+t3QY71fIlAYM hTx5piLkIMDYsQBDGryE+hHwQIjGytxrCNTooHs5hL7gem0JcqmVc9mktB5V6zxJMid0 x+3IEVSX5nINhf8vby7gdGHancvczKHdKvA4yUSwsU9UPprOrzFB7+/FUFdlkI6f+vHJ ZOhw== 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=OxBB94zUrGR4KD3J06IO29Vjh8SkXb6HRPdmx2SFVtY=; b=1TRB6Cs7BPVDIktdCxvijg0Y6rKcftDdjQlLAB9reJ8d8XMBlKRr9GUTAhatRx4zj6 d8iG3iw+OfkCMc/RByCAQv5Qx2n+4hfEsDiZzTz3AtfOy/CjQxBm+MzJYb0Tdz3hFixm PeKHcuv16yaPKGleTG/O88qj3Mc9n38c+jlKGFvycyrH/PCot/GTEXRPrGuyoye3l3Vb 25sJdZfcX2fIm4F8RNLgHkyS3TyJTqnbySdF+W5f4KM3yqdrv9RjVK3EVBncFvNhGjdU wrAJLk7T+Phr1Gu683RHpi0c6TMUelwg75oB7SdspqHwf+iPPNhUNi4gzYvvFnDfvqiJ tNKA== X-Gm-Message-State: AOAM532zqElAgUAEeq4hosy4bN1JBzHUHfHeA06fLYTaO/G8hazYQUNC SsmRnmsV9tiUx+tp47kGZdbzIa2aHSs= X-Google-Smtp-Source: ABdhPJyHsWX3y0FAI2uN62HKdtPSEjgVzmd9/NRa4eobof6HI0ol37mnJQxHgO4gAkZD9XwignkODw== X-Received: by 2002:a05:6214:238e:: with SMTP id fw14mr2291271qvb.86.1642039269977; Wed, 12 Jan 2022 18:01:09 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id y17sm1182232qtj.75.2022.01.12.18.01.09 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:01:09 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:00:01 -0300 Message-Id: <20220113020026.590-6-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 154/281] swf: 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/swfdec.c | 8 +------- libavformat/swfenc.c | 2 +- 2 files changed, 2 insertions(+), 8 deletions(-) diff --git a/libavformat/swfdec.c b/libavformat/swfdec.c index e549e4f50b..52c5e5c480 100644 --- a/libavformat/swfdec.c +++ b/libavformat/swfdec.c @@ -195,13 +195,7 @@ static AVStream *create_new_audio_stream(AVFormatContext *s, int id, int info) if (!ast) return NULL; ast->id = id; - if (info & 1) { - ast->codecpar->channels = 2; - ast->codecpar->channel_layout = AV_CH_LAYOUT_STEREO; - } else { - ast->codecpar->channels = 1; - ast->codecpar->channel_layout = AV_CH_LAYOUT_MONO; - } + av_channel_layout_default(&ast->codecpar->ch_layout, 1 + (info & 1)); ast->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; ast->codecpar->codec_id = ff_codec_get_id(swf_audio_codec_tags, info>>4 & 15); ffstream(ast)->need_parsing = AVSTREAM_PARSE_FULL; diff --git a/libavformat/swfenc.c b/libavformat/swfenc.c index 1fd2ad81a3..d12fb59348 100644 --- a/libavformat/swfenc.c +++ b/libavformat/swfenc.c @@ -348,7 +348,7 @@ static int swf_write_header(AVFormatContext *s) return -1; } v |= 0x02; /* 16 bit playback */ - if (swf->audio_par->channels == 2) + if (swf->audio_par->ch_layout.nb_channels == 2) v |= 0x01; /* stereo playback */ avio_w8(s->pb, v); v |= 0x20; /* mp3 compressed */ -- 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".