From patchwork Mon Aug 8 01:25:30 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hutchinson X-Patchwork-Id: 37180 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:92a9:b0:8d:7f3b:94fc with SMTP id q41csp1553631pzg; Sun, 7 Aug 2022 18:25:57 -0700 (PDT) X-Google-Smtp-Source: AA6agR7J+z4nZl1d007/6BQA7bBzfUMfWe5g7FzohkVFYhHexTRD8KjUln0hqqXFSh9i3PEpwNc2 X-Received: by 2002:a17:907:6d98:b0:731:2bb3:8e17 with SMTP id sb24-20020a1709076d9800b007312bb38e17mr5572450ejc.203.1659921956983; Sun, 07 Aug 2022 18:25:56 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659921956; cv=none; d=google.com; s=arc-20160816; b=0X6ZFogVdFw8yDVjRdsn5Ono+4DTSmm1SUafEGO3wTwOdLqAE2NDfp+/uKM0xdkvCP QA6JxGK8/Wv/z6JiMCMMVM7FcNY/tRWj26SRNiMsXw9RTt5ybV4JBdrSUoY4RXB88QZj BJ2M471lUdm52DEB7pjNRMhblwWEPMfO8HmhDfoqh3ALhMb3XSxK6p/0m4hZ4hk5SU5v KSBC1TltWXFFtIn+np0MFDI8LQcMLOG/K9UUg3n26+cicJNwD0LlSZC/tNWRdPtlVHjG aS9I+t2HqvU7sm5ta3loR1zP5kHcVEWHX6cKySs5JtW21Rfn9QP8zQRzBfrEmU2TNg2g DeMQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=wuVGD/OEKsgtHcn6a9/6lM+2eDZRH77IbWGGBgazSk0=; b=IFYhzzyNYubArhoQPHksVxawTahPjkDQMjI0afN7YYbJgUQS6YZrAYI/syclMTBekb npDA0smt6c4nY+J1XadIIM7fU9/4ArPPG7O/ZlY/SobbmOFgbC5d11WiPWU7JDmvWgCZ RZl85NmuA5zNO8KYDy1pwTr4RO6qs/4PjchBZzBOcf82OHZSpatlgTE9F5In+xByFB+k Jw9BEri1XFWxU5+c10rY6ZTmctQCdS3Q1xPZYISPq0qIak9MlpbiFweynC9FfqrLDnvg 2IHnrUo3kMvXWgczRsTjIhTGgroghydazjuKnDSOwK3wxjRVYvEqDrtLweSY3d7UiMAL JclQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=goBjA3yy; 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 qa39-20020a17090786a700b0072a99a9ed8fsi10032133ejc.948.2022.08.07.18.25.56; Sun, 07 Aug 2022 18:25:56 -0700 (PDT) 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=goBjA3yy; 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 A97DA68B711; Mon, 8 Aug 2022 04:25:46 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ua1-f48.google.com (mail-ua1-f48.google.com [209.85.222.48]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id CDDCA68B590 for ; Mon, 8 Aug 2022 04:25:40 +0300 (EEST) Received: by mail-ua1-f48.google.com with SMTP id b4so2991287uaw.11 for ; Sun, 07 Aug 2022 18:25:40 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=PQLzEwR/F42yJufVCg0qNLLTMmcZVJZUv1qZLtNtBtg=; b=goBjA3yyfQh+HtPBiPyQEJkV/+Y80gJTbDRLM/vtt1my4BYTUnG+0QMev0Hv9SNUSj DAqFZexX1j/GZIVwjI5Djw+xDGMfVbQ8EycAC4L3j4NSXJxRurujNoXoo94z20oyDypV /XX3stC5Rzs4lBijjaG++cFARn372wcxbeWSMNPTQOuLbS49Ulyzd7nX2RVKeRAMYY+7 WX1YO6McQSCqNReeHqO9+CEDnSD/MZ2sqdtvWpoJ9aUjrmHQLnVJoFVf1I8SBEqpZg7s KZzXxn5qxdkUbQnq8jYoRDiENFDJ0cPtWF8wGmDnq4w5+jWCe6Q7ViH9ZDnGjJoNTCxZ N3ug== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=PQLzEwR/F42yJufVCg0qNLLTMmcZVJZUv1qZLtNtBtg=; b=UZedQ3taScF2an+ovYK6eN8isM/hInJUu8zmuwAzWDoU/q04/FMkVAmNbvcoQvKXJb C0LHp3ZyQRXbvNmignDYvh9cAiMmE2+F+wuYp3Yi/7EjGDDrJVEOnrapfrUeqsngD/NQ hzABl/wSQjVW3sQyecrXoTullFN9TcGuj+9/TeBJNzpiN4BS5S1ufHZ+nC1UbbCSL6Ak RxVIxxeUzoIK4Su5dHDVo8rnZaQx5hXy5RkbtkyEKAFXdZ292Rnr52PPIoJpMzY3wfdN IHAooQDwk3dfhIHjDvwSivv7LQw66YCWyaj7sG23nKhR0GV+lj9ue1jvee56kc9E80YX zYrg== X-Gm-Message-State: ACgBeo03NGMO88eLFZWeQaP4EldSW+jk721JHuWitvbJlLUGWLJEkMsL jV26tjJTu9kD1/Ur8yRdVxHdyVA6HOCWSw== X-Received: by 2002:ab0:2a8b:0:b0:387:3315:c506 with SMTP id h11-20020ab02a8b000000b003873315c506mr7037338uar.20.1659921938790; Sun, 07 Aug 2022 18:25:38 -0700 (PDT) Received: from cappuccino.. (075-115-109-114.inf.spectrum.com. [75.115.109.114]) by smtp.gmail.com with ESMTPSA id n25-20020ab071d9000000b00384d3ce037dsm8053646uao.4.2022.08.07.18.25.38 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Aug 2022 18:25:38 -0700 (PDT) From: Stephen Hutchinson To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 Aug 2022 21:25:30 -0400 Message-Id: <20220808012532.41519-2-qyot27@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220808012532.41519-1-qyot27@gmail.com> References: <20220808012532.41519-1-qyot27@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 1/3] avformat/avisynth: add missing avs_release_video_frame 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 Cc: Stephen Hutchinson Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: UxX7AZ7f8zat The AviSynth C API requires using avs_release_video_frame whenever avs_get_frame has been used, but the recent addition of frameprop reading to the demuxer was missing this in avisynth_create_stream_video. --- libavformat/avisynth.c | 1 + 1 file changed, 1 insertion(+) diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index a97d12b6b6..98b4d68a57 100644 --- a/libavformat/avisynth.c +++ b/libavformat/avisynth.c @@ -728,6 +728,7 @@ static int avisynth_create_stream_video(AVFormatContext *s, AVStream *st) st->codecpar->chroma_location = AVCHROMA_LOC_UNSPECIFIED; } } + avs_library.avs_release_video_frame(frame); } else { st->codecpar->field_order = AV_FIELD_UNKNOWN; /* AviSynth works with frame-based video, detecting field order can From patchwork Mon Aug 8 01:25:31 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hutchinson X-Patchwork-Id: 37181 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:92a9:b0:8d:7f3b:94fc with SMTP id q41csp1553687pzg; Sun, 7 Aug 2022 18:26:05 -0700 (PDT) X-Google-Smtp-Source: AA6agR6jVBOJZhWeCsmRKCl+U6udRGrg9gLplgh+Pn6hEH1mqjKLDAWvbc/Z0TJoRDr0hV65so8w X-Received: by 2002:a05:6402:12cb:b0:43d:6e77:19a7 with SMTP id k11-20020a05640212cb00b0043d6e7719a7mr16499951edx.342.1659921965632; Sun, 07 Aug 2022 18:26:05 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659921965; cv=none; d=google.com; s=arc-20160816; b=L8iLnO2dZWVQsA/GNguPgm7goUfl5Ba7Ht/tyRH0eRpdhG80s/jG3nSOX+kvgr/3JQ 6OUvEk2FQ2DWTV3VlqlCOlZu3SpPnzzK5RCX0GkainzjaA2oWQDQs/bU4gMZjxTz07vy auAJNpYDNWJiLY9lsB23QfErHco8FwygkxnlCg6qSR3vWDFDe2yW5H7rk2vDvxpFGerh 7G0mxS46T//s2afZSRfAfz/ame9cHOjGibfSiySmQ9RMRp6XRcVGCsCa2kCe6v/WNY2B 90A/9wy0YI3X+Ou4J5Y5D+VTnbeyb/TNUTUTJS/3YrZw0E7cATJiVaexTm3C/OMjXy8f LSfQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=kO+OBcWFBWn+2Sv9nG+t1feew59ZvVfliqigFCCMm40=; b=mj8q0gOhrmJTu7tRkI/ikD0W+bgP7tgVR1LukuB9tNHxajdjLEBvcY+LaQreOi5nZb MupMY+sjW2rMI6PpaHbp2Q5tYK7kRf06aUfKmy5/lqdT0D+MP5XEn5xB/HX8XMzZj+L5 GA71R4VN6wkaPHtccQ53QLzeTeO/mmybMbQcm5xjgvE0ELA1BNoQIBJzRfr9CiVObc3W D3/xImE6H5fC+4EJ2e6z5RuIWAAQsjec0yE1jlVZ5KQqYfLCdBD8MKELWDRbpFc7OvE3 8TRbeMQJkbW3Ic9OwMaoWMV23De12r+5ln2tF5UDCxxoWmusS55rWUfgk7sGj+PYK75A 1p7w== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=IHXxixdp; 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 d13-20020a170906304d00b007308fcad6d2si8073852ejd.358.2022.08.07.18.26.05; Sun, 07 Aug 2022 18:26:05 -0700 (PDT) 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=IHXxixdp; 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 D9E1268B722; Mon, 8 Aug 2022 04:25:49 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-ua1-f47.google.com (mail-ua1-f47.google.com [209.85.222.47]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 1CE0468B70E for ; Mon, 8 Aug 2022 04:25:44 +0300 (EEST) Received: by mail-ua1-f47.google.com with SMTP id y22so3007858uay.1 for ; Sun, 07 Aug 2022 18:25:44 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=3PJG/Pl6YuUhbM43F4fMmcKAcHcbKbwCVDOK1wh0llk=; b=IHXxixdpq0RXDb9qXy1xWmU0zinDrawsx1LqJLrQLqosA0xqiwiugVi3l5bUWZASxI Hd+5d63cIT21O15Ew70Mya3MPHJ98FFIrXrvD/aZZycWSrhlok8M1nABNvD4nsuxII7n vAl8rFfCZQvsAo1WnRO8aM0pYfxAiV8vkxvAnjvVSt/G+vuPmKUEIRPsvEefc2eJUyrZ VonE8b67UJo0icGjJXjfgAh5RJkj852e4ExarOBCkTvf0moN4FwnUs5U6Ega3ZHW9DS3 REGu1avdp7i6jvQzv7euuDbyr0ZSc8u8nzhSxb8SaSHjwMLqRclUNfZ1GzmX5k/WtoUn 34lg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=3PJG/Pl6YuUhbM43F4fMmcKAcHcbKbwCVDOK1wh0llk=; b=2tpWKnjYg9UzS+KtZCHFuM4a9o5hnIg7s3fHExbZvYVSs8mxvjDIz2P78N706yAWfd 5GQEqKR9UevdpxUp5GnLYZiqrwhwoaGnrcr74VDb/JEvpB02r+HtFbJjTPBDSWN4lw9h 0aSBo2HsbR1GkwSTMZx5f9C2aGy3lrFBUtAIjIKYjkfZQT4agc0uftRo5Q41KOBS8IhW G48rAIsDVcbIFeB7m94mEVAlpH5S+3qaM+3xD2amiWAs1Dm97wpAUkU8XTSpBCYogIau siG34+7+45ci41RvWXPrGY1GwkLMKbJk2khAMq8bGse9jnwESd7XKaatixb3DX7t3kVj z1KA== X-Gm-Message-State: ACgBeo35kH/4FrMXsxkSGq/xGj8GoNm7xz8lfR+OKuv7tMkNO9SsVvu3 cnqCtxOV38yasF87jim3t0sIGBKNlCyWHA== X-Received: by 2002:ab0:7c46:0:b0:38c:8967:bd23 with SMTP id d6-20020ab07c46000000b0038c8967bd23mr2229965uaw.105.1659921942533; Sun, 07 Aug 2022 18:25:42 -0700 (PDT) Received: from cappuccino.. (075-115-109-114.inf.spectrum.com. [75.115.109.114]) by smtp.gmail.com with ESMTPSA id n25-20020ab071d9000000b00384d3ce037dsm8053646uao.4.2022.08.07.18.25.41 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Aug 2022 18:25:42 -0700 (PDT) From: Stephen Hutchinson To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 Aug 2022 21:25:31 -0400 Message-Id: <20220808012532.41519-3-qyot27@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220808012532.41519-1-qyot27@gmail.com> References: <20220808012532.41519-1-qyot27@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 2/3] avformat/avisynth: use ch_layout.nb_channels for channel count 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 Cc: Stephen Hutchinson Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 1c/KfK3RUBo7 Fixes deprecation warning --- libavformat/avisynth.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index 98b4d68a57..5605fbefc4 100644 --- a/libavformat/avisynth.c +++ b/libavformat/avisynth.c @@ -753,7 +753,7 @@ static int avisynth_create_stream_audio(AVFormatContext *s, AVStream *st) st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; st->codecpar->sample_rate = avs->vi->audio_samples_per_second; - st->codecpar->channels = avs->vi->nchannels; + st->codecpar->ch_layout.nb_channels = avs->vi->nchannels; st->duration = avs->vi->num_audio_samples; avpriv_set_pts_info(st, 64, 1, avs->vi->audio_samples_per_second); From patchwork Mon Aug 8 01:25:32 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Stephen Hutchinson X-Patchwork-Id: 37182 Delivered-To: ffmpegpatchwork2@gmail.com Received: by 2002:a05:6a20:92a9:b0:8d:7f3b:94fc with SMTP id q41csp1553728pzg; Sun, 7 Aug 2022 18:26:14 -0700 (PDT) X-Google-Smtp-Source: AA6agR4gcdKAw/FneLAGbXvljIzFjHaW2NpNGdXYscJq/YuZUtQaArHZKmtvSmOhsM3yPCdj0HY2 X-Received: by 2002:a17:907:2cd1:b0:730:65c9:4c18 with SMTP id hg17-20020a1709072cd100b0073065c94c18mr12270677ejc.324.1659921974611; Sun, 07 Aug 2022 18:26:14 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1659921974; cv=none; d=google.com; s=arc-20160816; b=rTituIfJmIQlGycUhnXJV/RW8AME3LQFBj3+dE+nvZCvBdTUo3XT3RDyAfwn+6SoYe 1KmG+DUhtHtluqz1DHReRUYf/nZq7jN68/sKj8A+HM247bb0Y5U/nGr+P4/5Z4Qh5wRw V0EV9TNDE1PBTY9N+bpEsAjsV/t5ulaibiVLMBPWZrRBUqn/Vynv+nR0N3ATUCKZMsk/ JE3YvIQGcaHTl9JxidFDDZKH1LBlQMTkz8cLF+pUWKFA9G9tNnlfYqxudUZFJsN5+Gu7 S3yOnsSpVdvB0eU5DVHpUjCE0aKhCRYSrW5+FqpBP3FuvK+G6f0V+D1f6jJ7QexyFumS lNXQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:content-transfer-encoding:cc: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=4vsNlNTszm3Dg1zyiwWRf0Sd6P1ZlvGeo5YjcCqdvuc=; b=CS/e7rUWdZ3bg/9r2hMVnbtFSzTRQCq/4jNGyg4t58G84NEvJ94lG/f+wATAwDJWjk UwYmv4IItKAS7EjoVGOI/3nXvftuqbWbpOUlMTf3/nSq4zhhpLBLyEO6JOYgAKBApT0v 3DqFBvsijpkPXUtRQtU4klzE5+Yoo9TCb3VdgGDOEqZaODyZCPxSSk+GsI5bFmQ/No8v WHMOYiSNCuKMiEqs5A0qQB+gn53Q8Sz+Qc3DtzTC82Ls759JlHzHxicqZjOh5Wanjm9x ClUKCtF4vXXIAgGPdM0Ypifan1lCB27aObg09S5xFVkfUsJqCNl5t0AgWsJuuO2wVPX9 YcJA== ARC-Authentication-Results: i=1; mx.google.com; dkim=neutral (body hash did not verify) header.i=@gmail.com header.s=20210112 header.b=Qt2MQXLq; 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 ft29-20020a170907801d00b00730d12fc3a3si7332069ejc.852.2022.08.07.18.26.14; Sun, 07 Aug 2022 18:26:14 -0700 (PDT) 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=Qt2MQXLq; 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 E212468B734; Mon, 8 Aug 2022 04:25:52 +0300 (EEST) X-Original-To: ffmpeg-devel@ffmpeg.org Delivered-To: ffmpeg-devel@ffmpeg.org Received: from mail-vs1-f43.google.com (mail-vs1-f43.google.com [209.85.217.43]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 498A368B71B for ; Mon, 8 Aug 2022 04:25:46 +0300 (EEST) Received: by mail-vs1-f43.google.com with SMTP id m67so7494023vsc.12 for ; Sun, 07 Aug 2022 18:25:46 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:from:to:cc; bh=vN1UzKOEok2oKddVhmvLOxreFqEIxNCJ4Lh9YmJXneU=; b=Qt2MQXLqYs8MvyytgyTjd+c87Yik5OydpAcb0JILxKV/NbC5ZPmAVwW8PJOB1wUtaz PlMNMCI6FH+6IJZU/A7vubMeTlr5BNzOLlQxgCoucR0EHDC1c9yFxNh4fIHjOL4SBV0L uC0TgEXOnd/pztfrxYf4+Us7U3e9fY5HiN8x/teimUBM0gXBYnDUgRzf1y7vucuPBhp2 jYQTQPZA0nVhChJiQbnKAJigDTVyZsS1Q0Hw2NlyziL2jTySGW99pS3O/oTEr/34OF7H viK25Hs/AV9N6/dLz4MaJ+HdhxNilF3PITg2OFlxtA15FQdbWurXC2PzbrRfA3EiCcW0 a3yA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=vN1UzKOEok2oKddVhmvLOxreFqEIxNCJ4Lh9YmJXneU=; b=foclVAg9NiqlYJlLW1HR9xGiA2BlEssuIXqaX9FS8TCkOsRYvqSbpfuGMMVktKo3gJ P2hDZnvNe32bpp/rrJMkCJAfAbuYVE7NAFnV7j/MH7Kg0ajWNBvS8Z0XefBmkgKo5HgU NCUBiXEQ76KWkSceYP5suFe3Tpp/WWS9ZJpJfflSyfWVYMqxIaE+EQkAWlwX1WhsTPT6 OabdyieTuPVnDL0XZAzDFrHwVWLOFnWZE6fZp9zdaPsjjwnUC7Us/fZRLrqJ8nMHSBX3 s3fQ7pksUX74X1pr6OKesjyfvgDr1tkTkZaxgYpYseJChTwdoIZ+2qCQvn7UDTsrcQiu jWLA== X-Gm-Message-State: ACgBeo2iVl2ehQyd95wBzVsKKPMl7y4fSio6VUD5yx0A73hU7CB1EjJ4 NNnBWxlsUu2nHBIouXxCm+ZjNJE0r0EQtg== X-Received: by 2002:a67:f9d1:0:b0:36b:73fc:7b24 with SMTP id c17-20020a67f9d1000000b0036b73fc7b24mr6105502vsq.57.1659921944194; Sun, 07 Aug 2022 18:25:44 -0700 (PDT) Received: from cappuccino.. (075-115-109-114.inf.spectrum.com. [75.115.109.114]) by smtp.gmail.com with ESMTPSA id n25-20020ab071d9000000b00384d3ce037dsm8053646uao.4.2022.08.07.18.25.43 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Sun, 07 Aug 2022 18:25:43 -0700 (PDT) From: Stephen Hutchinson To: ffmpeg-devel@ffmpeg.org Date: Sun, 7 Aug 2022 21:25:32 -0400 Message-Id: <20220808012532.41519-4-qyot27@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: <20220808012532.41519-1-qyot27@gmail.com> References: <20220808012532.41519-1-qyot27@gmail.com> MIME-Version: 1.0 Subject: [FFmpeg-devel] [PATCH 3/3] avformat/avisynth: cosmetics after nb_channels change 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 Cc: Stephen Hutchinson Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" X-TUID: 41icCyoBCwgn --- libavformat/avisynth.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/libavformat/avisynth.c b/libavformat/avisynth.c index 5605fbefc4..3d9fa2be50 100644 --- a/libavformat/avisynth.c +++ b/libavformat/avisynth.c @@ -751,10 +751,10 @@ static int avisynth_create_stream_audio(AVFormatContext *s, AVStream *st) { AviSynthContext *avs = s->priv_data; - st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; - st->codecpar->sample_rate = avs->vi->audio_samples_per_second; - st->codecpar->ch_layout.nb_channels = avs->vi->nchannels; - st->duration = avs->vi->num_audio_samples; + st->codecpar->codec_type = AVMEDIA_TYPE_AUDIO; + st->codecpar->sample_rate = avs->vi->audio_samples_per_second; + st->codecpar->ch_layout.nb_channels = avs->vi->nchannels; + st->duration = avs->vi->num_audio_samples; avpriv_set_pts_info(st, 64, 1, avs->vi->audio_samples_per_second); switch (avs->vi->sample_type) {