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 6E06E40444 for ; Sun, 24 Apr 2022 22:04:34 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 72A4668B244; Mon, 25 Apr 2022 01:04:33 +0300 (EEST) Received: from mail-oa1-f53.google.com (mail-oa1-f53.google.com [209.85.160.53]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 04A1968AF1E for ; Mon, 25 Apr 2022 01:04:31 +0300 (EEST) Received: by mail-oa1-f53.google.com with SMTP id 586e51a60fabf-e5e433d66dso14315450fac.5 for ; Sun, 24 Apr 2022 15:04:31 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=message-id:date:mime-version:user-agent:subject:content-language:to :references:from:in-reply-to:content-transfer-encoding; bh=lTrun4Qn+l7pTYaafooi9ZA1SBUjWOmQMvgUNrALoHE=; b=LY4lKw3avV335OqfpueWqjcCPcKMikxldVk2jDY3/tAFCLauRAUDQ6Mcl+eoaqEZIZ GKp4JhhEgwBFfVnlVdEHwBbF6P4UAIpWJdVAHM82GjRYLZBxl6qSIPm+xjoz22bsB0AI pfMi7EuIGWbwnLuKwzG4uVluCDwAJQ/8ffK9HkDf3UrJ4mmZNAJ7TaHhYsL/t3XyQ8m1 2PeV1sG50lH/mR7+f8AbIyH86JhXvvOddNhZsueisT1huPOooGF3IqNU2b2R9Qz51CAG wbPZROByK3v+3uBcZxuA0JD58C2gO1buLlATdNZvdBYGtzj1/NB99xEgqyyNjxuLY1mC 8UAg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:message-id:date:mime-version:user-agent:subject :content-language:to:references:from:in-reply-to :content-transfer-encoding; bh=lTrun4Qn+l7pTYaafooi9ZA1SBUjWOmQMvgUNrALoHE=; b=pwwBnV0WrmictmgCDmFSQ425WO8ICdHEIFhmcUoZMKAaBZwepKy97waQn2CPLPkGjG ap1tycSedD28xjaPK7FqiFtaAr0UoOYgoMrltVsXlnDNOWYLhqzMPdLy7kemtcR7PNSk Bwoc8smlwSHp22j5EeMHMy8RAjCqzTwnbybfJL8Cpne2bO8G0Y6FYk0e5QDPB29/A7xg kxF2Hp/wOqo2oZ6ZjPVQ+8inLTAE6y2aZ9MRXQ4soojkUHxmJYBsGO3k+BrXF0NW/ZKa NriAfdWdfF/QsX4kqNk7z9pb1sGK4gflv3y5SDawvogRCdmymGGPDFc13W9G+iu3p8Yt LvGA== X-Gm-Message-State: AOAM533YGSOqXhLsctKc661NRRrAHOjst8DaqOztq6oSjAWjFnQ3bSnq B7v1Jm3nDTDMW1DYr0r+C0TbJIdLum8= X-Google-Smtp-Source: ABdhPJxYrlUS8C8hC7Ufwy13K7a+lQlQQOvipEFwSj7U54vkLXcNJMJWGsI5LYscX7EMnRAirl25eQ== X-Received: by 2002:a05:6870:6021:b0:e5:e562:c809 with SMTP id t33-20020a056870602100b000e5e562c809mr9601841oaa.70.1650837869812; Sun, 24 Apr 2022 15:04:29 -0700 (PDT) Received: from [192.168.0.13] ([186.136.131.95]) by smtp.gmail.com with ESMTPSA id ay9-20020a056808300900b0032272231c25sm3067983oib.40.2022.04.24.15.04.28 for (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Sun, 24 Apr 2022 15:04:29 -0700 (PDT) Message-ID: <0fe850b1-2444-aa0a-3c59-f2a25f35e474@gmail.com> Date: Sun, 24 Apr 2022 19:04:28 -0300 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:91.0) Gecko/20100101 Thunderbird/91.8.1 Content-Language: en-US To: ffmpeg-devel@ffmpeg.org References: <20220419081318.729-1-dcnieho@gmail.com> From: James Almer In-Reply-To: <20220419081318.729-1-dcnieho@gmail.com> Subject: Re: [FFmpeg-devel] [PATCH] avdevice/dshow: reuse unused variables. 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-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: ffmpeg-devel-bounces@ffmpeg.org Sender: "ffmpeg-devel" Archived-At: List-Archive: List-Post: On 4/19/2022 5:13 AM, Diederick Niehorster wrote: > Fix for f125c504d8fece6420bb97767f9e72414c26312a, requested_sample_rate > and such should be used. > > Signed-off-by: Diederick Niehorster > --- > libavdevice/dshow.c | 6 +++--- > 1 file changed, 3 insertions(+), 3 deletions(-) > > diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c > index 1e69620880..5946a72cc2 100644 > --- a/libavdevice/dshow.c > +++ b/libavdevice/dshow.c > @@ -1003,9 +1003,9 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype, > continue; > } > if ( > - (ctx->sample_rate && ctx->sample_rate != fx->nSamplesPerSec) || > - (ctx->sample_size && ctx->sample_size != fx->wBitsPerSample) || > - (ctx->channels && ctx->channels != fx->nChannels ) > + (requested_sample_rate && requested_sample_rate != fx->nSamplesPerSec) || > + (requested_sample_size && requested_sample_size != fx->wBitsPerSample) || > + (requested_channels && requested_channels != fx->nChannels ) > ) { > goto next; > } Will apply. _______________________________________________ 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".