From patchwork Thu Jan 13 01:58:06 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: James Almer X-Patchwork-Id: 33425 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a6b:cd86:0:0:0:0:0 with SMTP id d128csp32737iog; Wed, 12 Jan 2022 18:24:45 -0800 (PST) X-Google-Smtp-Source: ABdhPJwnsDfAdm9qiBo2t/4778zuqrhSr3ogh2JYlsPJJ13U0ZY3LwBm8NOSOBkUhkPBOKds/xts X-Received: by 2002:a17:907:72d2:: with SMTP id du18mr1934976ejc.208.1642040685785; Wed, 12 Jan 2022 18:24:45 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1642040685; cv=none; d=google.com; s=arc-20160816; b=kHFnKg+3IhqSOPGt43NHXbQTpewaQ/gVp5zw4yBWKaSs+TPJPXZwgnwAgxhiZ1OyEr XvKcak7myG+zOMYv1eG3puYPDBUK0jDxH5/hYmu28P2OLlRU+u7BlD6d2HLou1f5lfvN 7xCTG0vEqfKNBL0K9NAvBYYK58OOO41ieSRoVWCf0yXtPtKXl9N45C7swvrHSBln0rUU 1t4/P3NrLDK1jCLeNySWrNlswbEkJN6h0G5zPIe8cwxjc6Q20cBKmFBS2gBHQBkg5cAM 9nNVDIzb0O1yMAe63/m2esIFbHwmOl89sVeXs0XuyKU9RS7TTcRaZStpvykxv4/18CKA E02g== 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=BxAtU090ydojw7X9ncJTraVP0ZxTwsLLQVEKRV9xVCg=; b=VAWIQKVHQG9cbbPfVjbW9/qI4D19E7In3whvw9UZGowZrvCcyb3yzmqyOG3J42Jnin Sd27XDkrRpy03Tl45kohNVVtD9LeEXhktkt2i3Df3TvHl06pNQYQ5CoiSwJ/e/xUABB4 pS/oFjt6Qp9aie8t5E0c+prZG50c8EJe8JB5U9XtFv/drGYqVCiKjD4yvi/iZSOCoZMX vTpEEshQVfskYJnjdB+Falt5jcx4lXzH5R0Dng+/BPyRmSuz+V83EZvV+XpCKzZOMQEK SR+lugQxjPLfs+Nvw5FmSIiLE0NeLag3+1fuCRCPCwcI3jcS4hJMp/W13AD5aXx9ejSl Gccg== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=W+40P8Pm; 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 t22si443557ejf.206.2022.01.12.18.24.45; Wed, 12 Jan 2022 18:24:45 -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=W+40P8Pm; 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 2199868B411; Thu, 13 Jan 2022 03:59:07 +0200 (EET) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-qt1-f179.google.com (mail-qt1-f179.google.com [209.85.160.179]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id DCB9A68B3F9 for ; Thu, 13 Jan 2022 03:59:03 +0200 (EET) Received: by mail-qt1-f179.google.com with SMTP id q24so1551714qtp.5 for ; Wed, 12 Jan 2022 17:59:03 -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=V/dJAiRsz4PKxWSrNMRdr9moQRbT/CpAjni6luYvigU=; b=W+40P8PmLGBKg1LvuZX46tT/1j/5hxdCcuuFCdib6tZb9QKy04i7rUEK0xzddnhegT 9sBj7W+iuqHnOaO+E+rVDyuy4w54urU4xBgjUm43/k3ti0rknuk9lmsVCfVtAqc89XZb O5Og/TQUT1yO8TUvZHoa4vXMrW5Kqg9RuDx8fLsqMKdPjVFAxoldY577wnerliRi/W15 tOOMCOyLhHETIPvDV60//6pklhtiFkEyUcZOj1uIPBGjM001vSqyo/zkKYTuEd8ba2+t 2spRshWL0v/oXgJWvQkbjJ8E5fdcr06f+faBV+6h98P7o2/fIGs8mkcHsRcpKru3WPaf E39g== 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=V/dJAiRsz4PKxWSrNMRdr9moQRbT/CpAjni6luYvigU=; b=yxLK0/6gIiTGS/LsnIeH5wqgsgMOwyS3ocwLX2z1NMLTsjgpGQVcV6f7SpuXa8JbZV cWJWY9WUK30a1G7iO/fh1BVOw38fW+7Zaw1kZU3N96u7jwP4H8P/9ewuqNaLR+WBA0Wh NK1wNvh0v/H9QlaJKOA1tV6f5X4JH2fPPEUudJWLV/Iua9/zGABq1wCjZAJe9EL2T6sY qcoP8aajh/SVkZStd/ly9CSs4uRYHSkbM4DeNinxPPWB278IVFwmtkf1RCyS+PojjSir Y29YHYwd7pjGNkygPNHqNek50WqhQ2p/vV+uhPLeZEBwr4oheq8+L/Q5qSZYyoNEKCeE Jj8A== X-Gm-Message-State: AOAM531EOazpoB3p3wgdDwZHSnGhK71HPLEL7/6LAK/xYrDb83kbC/tB R0nlwx1nTzwAoNQGMlkzg9PLMVch7I8= X-Received: by 2002:a05:622a:292:: with SMTP id z18mr1989492qtw.205.1642039142498; Wed, 12 Jan 2022 17:59:02 -0800 (PST) Received: from localhost.localdomain ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id u19sm893081qke.1.2022.01.12.17.59.01 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 12 Jan 2022 17:59:02 -0800 (PST) From: James Almer To: ffmpeg-devel@ffmpeg.org Date: Wed, 12 Jan 2022 22:58:06 -0300 Message-Id: <20220113015806.519-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 149/281] smush: 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: JWE4C+WsWHu4 From: Vittorio Giovara Signed-off-by: Vittorio Giovara Signed-off-by: James Almer --- libavformat/smush.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/libavformat/smush.c b/libavformat/smush.c index 59807ab963..a0a6971e30 100644 --- a/libavformat/smush.c +++ b/libavformat/smush.c @@ -178,8 +178,8 @@ static int smush_read_header(AVFormatContext *ctx) ast->codecpar->codec_id = AV_CODEC_ID_ADPCM_VIMA; ast->codecpar->codec_tag = 0; ast->codecpar->sample_rate = sample_rate; - ast->codecpar->channels = channels; - + ast->codecpar->ch_layout.order = AV_CHANNEL_ORDER_UNSPEC; + ast->codecpar->ch_layout.nb_channels = channels; avpriv_set_pts_info(ast, 64, 1, ast->codecpar->sample_rate); }