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 34F5642EA1 for ; Thu, 13 Jan 2022 02:32:09 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id CBFED68B587; Thu, 13 Jan 2022 04:01:50 +0200 (EET) Received: from mail-qt1-f177.google.com (mail-qt1-f177.google.com [209.85.160.177]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 5F3B768B57A for ; Thu, 13 Jan 2022 04:01:44 +0200 (EET) Received: by mail-qt1-f177.google.com with SMTP id y17so5331213qtx.9 for ; Wed, 12 Jan 2022 18:01:44 -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=p1o1duv44UTAlXx+dlcMBtEC3aDl6XuDDN5CEPRMYck=; b=H+gTw5bwMZAjs+WGALYV1jWv/ANsfc3IaFEy/HrKDZy4Km2jCcAXdMm1dWORPsjkhD OmYhQ3C5iHYLbd6+7TCzfXI5P3hc80lPGjHINADYVHPChkePtpwbvscRv8LLTNz4F8y7 K6O5k6XFmJ36q2Xktl4PXc1vlnZLnSviqwXVoMF7vHydvmLu1KcTT4fRRPU0/dGssjBl PQ0Lz/TwiAPv5/tUqFyrYmNnJFguCsPGsuW6CcIVTkcdv/UJXHok1O5jnvkp2s8WwttG CNZpS3TXTYj/kRfo5eI+BnZP2SMng8sNnP7Pb1k4xcBN9VfNM3rnWPsWJKRwfq5kC5yO EZOQ== 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=p1o1duv44UTAlXx+dlcMBtEC3aDl6XuDDN5CEPRMYck=; b=Jvn2nfu0/JE0teaCQNZqUXd7RIZ/zvMFa4bzLy7Fw46jAfrfS630invukIfsClZf+L Eq05cxMbFp1tn8nEHIZXT0TG7+WNzfkmmbn5n06ddDZtPDxUAhqK65RJng+ot4PJrh2F R/ldbG5IHtxnq6Pgp8muSVV1A9Cgr6yd6K9D+1ZXpi0w24RoZCEbau4YkvvHRFpIQxW/ 9vypotUPA/RshvIxS/I6nwb/1m2AV4XLKdt4imWvA3DKkUyvYEcSOjtd8u1eeLakwu9y G+GYog5S/pfj60/51sdCRVGtPHSykWkLmFMczByNClb5y9H0AuGkHzrr1es5ZSTTBzFF sb9Q== X-Gm-Message-State: AOAM5316DbtVqYsn2rRlDX/N9vAiVG3jtX53pMVqkElJevKdezhKp0ZN Z0JQrn3mgnpwYpbXI2pjqUPH3kmm3JA= X-Google-Smtp-Source: ABdhPJwoK/O7TkRIbaY2+1maH7j7hOptSbr9fPy1aPDCJR1pVG7OcOmaFTY8d7DCTwgAOTC9TU7g7A== X-Received: by 2002:a05:622a:1a90:: with SMTP id s16mr2009391qtc.129.1642039303045; Wed, 12 Jan 2022 18:01:43 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id y17sm1182232qtj.75.2022.01.12.18.01.42 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:01:42 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:00:26 -0300 Message-Id: <20220113020026.590-31-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 179/281] lavf: drop the channel layout compat layer for old-style (de)muxers 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 All the (de)muxers have been converted to the new API. Signed-off-by: James Almer --- libavformat/demux.c | 12 ------------ libavformat/mux.c | 9 --------- 2 files changed, 21 deletions(-) diff --git a/libavformat/demux.c b/libavformat/demux.c index 29c5f7539c..a9682a5949 100644 --- a/libavformat/demux.c +++ b/libavformat/demux.c @@ -194,18 +194,6 @@ static int update_stream_avctx(AVFormatContext *s) sti->parser = NULL; } - /* if the demuxer exports old channel layouts, convert it to new */ - if (!st->codecpar->ch_layout.nb_channels && - st->codecpar->channels) { - if (st->codecpar->channel_layout) { - av_channel_layout_from_mask(&st->codecpar->ch_layout, - st->codecpar->channel_layout); - } else { - st->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; - st->codecpar->ch_layout.nb_channels = st->codecpar->channels; - } - } - #if FF_API_OLD_CHANNEL_LAYOUT FF_DISABLE_DEPRECATION_WARNINGS if (st->codecpar->ch_layout.nb_channels && diff --git a/libavformat/mux.c b/libavformat/mux.c index 68983c773f..e68738e5c6 100644 --- a/libavformat/mux.c +++ b/libavformat/mux.c @@ -273,15 +273,6 @@ static int init_muxer(AVFormatContext *s, AVDictionary **options) goto fail; } - /* if the new-style channel layout is set, convert it to old one - * for old-style muxers */ - if (par->ch_layout.nb_channels && - !par->channels) { - par->channels = par->ch_layout.nb_channels; - par->channel_layout = par->ch_layout.order == AV_CHANNEL_ORDER_NATIVE ? - par->ch_layout.u.mask : 0; - } - #if FF_API_OLD_CHANNEL_LAYOUT FF_DISABLE_DEPRECATION_WARNINGS /* if the caller is using the deprecated channel layout API, -- 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".