From patchwork Thu Jan 13 02:07:00 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33520 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp45133iog; Wed, 12 Jan 2022 18:48:33 -0800 (PST) X-Google-Smtp-Source: ABdhPJy5cnW5fbun94u6UaP9XBV6uomT2FWT2VblHDoEXOpfx6vFaOUtAbif7W6K2gyzzFKxTo0W X-Received: by 2002:a05:6402:430a:: with SMTP id m10mr2364841edc.362.1642042113261; Wed, 12 Jan 2022 18:48:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642042113; cv=none; d=google.com; s=arc-20160816; b=Wi6Q5WapjHy49kYAXQ6SNM+UDgPfITigtZFeUPjehmG0Ybgfi1ps9M32i0+R/KeytN SqVRmd7ZooUUjNN6e+9rsOO30kK9uMKhposCDbMRs8b13ZHuKL7BweXezqADvTD74F7/ ZuPNWe4DYY4PrZaf6g3+8DIECmit1+xa4aCXN+wB6dHkxPKRreMSWww+1p4icZI746bL sMAkqXi4cdOR+iMTlzwIXTBk5gHhQNSnGBYvc7S7wV22HIBXQBOQUby4PyKyFXoI7SAn wLcU34ljLKVH44l0pdWi2jmdcmcGn820U+ixu2phOxtadOGVnZb8xPruwTWdCYiBikJz PbnQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:reply-to:list-subscribe :list-help:list-post:list-archive:list-unsubscribe:list-id :precedence:subject:mime-version:references:in-reply-to:message-id :date:to:from:dkim-signature:delivered-to; bh=ZFIguekPeDhEHFB5/95qRfK6GyXd16A9wGmk7a4TwSQ=; b=kUpykzjPbdGotX0cIIN+G2p+7IWX+MXf9KsomFBoDQl90hwy6kDRHq0BkKUrykG2G+ at8t7Zg4lzVit5498m2jTEpCwcbQvXvqVwRd7BSxxApdgWzNGmI2xiYknIiU0ezuzVfx oqTd9iwfGrNa9nM1L0gVgfsxR7cdccJLmAtFzs+sE7EXH66H2IxuTTmrQdi+fgBVoNXo wM/Ece6/nKNOMMCSvofk8PknNbtFHUchB4OhqaF6wA6yw+dc5fphO/26Pv2Ur4fytPTU OBCiiaSxCz1DvwE/+lpYHeOgtfFaOMJAuF0Cr8wqQpnKb4KBNYpaxv+G8S97P647rags /TcA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Z+ZvF6cN; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Return-Path: Received: from ffbox0-bg.mplayerhq.hu (ffbox0-bg.ffmpeg.org. [79.124.17.100]) by mx.google.com with ESMTP id g11si803654ejt.826.2022.01.12.18.48.33; Wed, 12 Jan 2022 18:48:33 -0800 (PST) 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=@gmail.com header.s=20210112 header.b=Z+ZvF6cN; 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; dmarc=fail (p=NONE sp=QUARANTINE dis=NONE) header.from=gmail.com Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 0C19F68B9EF; Thu, 13 Jan 2022 04:07:52 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qv1-f43.google.com (mail-qv1-f43.google.com [209.85.219.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1095668B9E3 for ; Thu, 13 Jan 2022 04:07:49 +0200 (EET) Received: by mail-qv1-f43.google.com with SMTP id hu2so5109961qvb.8 for ; Wed, 12 Jan 2022 18:07:49 -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=Fx9eC7EcTXkhOlBpEOLPj964PgwT56OZnNm5o8y2uQk=; b=Z+ZvF6cNpIP/IBxMlMhF9gZIdLD3wY4Sde5QFZ2GPGN3LIFNZY+Ji6jEruwlypTkxT FrEWUUGCtbsb2Yus6kGBE8EEHOkUHL8yHvRBNc4dmP3ZivzMbofBLSS0uimXc+CaIUfm A3wnzz18Wi1I57eEpolUKS7yXghOT9pDDMp1FzfVgGWsSpvqQHBwyNlJ7jUoP6kyC5eJ L9V/wZq9sM9pZSbK0383yMw0DmsWW0zEIV3N3MnW5G9cGVq8FgJg/I3KK3crZFDh7w5i 8jFtaefULeazTqmhAhpRST+SJLrF5RMzLfxRUiG+vtTXnxdQIhL/1xujURJaT634ZoLe XWfw== 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=Fx9eC7EcTXkhOlBpEOLPj964PgwT56OZnNm5o8y2uQk=; b=3hkXMX06kbnEBvJ4OVaSZ4rZhF09eSk3YDuw0YeusmusHFDeovneb8pLRoeRBwA035 bDmZbwFsoSyU5F2vV/woOl9MxbwuZQq13W92KL1KUvx1UY4A5ufGDC2mdRGjKNjTbrVS gcTJHt+mBM15ROnkWnj+IP8mt7xubYZeANVJy5aUmR5Waw30M4QzkdHegDCk27pr5dbZ PG2v/CXdqIAhrBqarGMrtHz4CAFrjZSTnb5kiAiiW/oivnvokyZeIXo/3h/EHGCfu++l 8g0J7kdlUtagvKiot7ei3LLl3r3fVB4bITxzmb9HVpp1PxEgRZgcF/UQ2Z2EeKfPegXY os5A== X-Gm-Message-State: AOAM532hzdowigqlLCKo/Z31yQgIKktnSEN8Op38vPi3e3mEBMjCex2M El+Fb3QI3fUychgSn40PV3lP7sUdxK4= X-Received: by 2002:a05:6214:29c9:: with SMTP id gh9mr2375568qvb.50.1642039668450; Wed, 12 Jan 2022 18:07:48 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id a16sm1085946qta.13.2022.01.12.18.07.47 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 18:07:47 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 23:07:00 -0300 Message-Id: <20220113020713.801-17-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 256/281] shorten: 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 Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: Z0gsQzIbWhPn From: Anton Khirnov Signed-off-by: James Almer --- libavcodec/shorten.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/libavcodec/shorten.c b/libavcodec/shorten.c index fde5c4b982..6cce675c9f 100644 --- a/libavcodec/shorten.c +++ b/libavcodec/shorten.c @@ -428,7 +428,11 @@ static int read_header(ShortenContext *s) s->channels = 0; return AVERROR_INVALIDDATA; } - s->avctx->channels = s->channels; + if (s->avctx->ch_layout.nb_channels != s->channels) { + av_channel_layout_uninit(&s->avctx->ch_layout); + s->avctx->ch_layout.nb_channels = s->channels; + s->avctx->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + } /* get blocksize if version > 0 */ if (s->version > 0) {