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 C6B3B41214 for ; Tue, 19 Apr 2022 08:13:47 +0000 (UTC) Received: from [127.0.1.1] (localhost [127.0.0.1]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTP id 6BAA468B371; Tue, 19 Apr 2022 11:13:44 +0300 (EEST) Received: from mail-lj1-f178.google.com (mail-lj1-f178.google.com [209.85.208.178]) by ffbox0-bg.mplayerhq.hu (Postfix) with ESMTPS id 9476168AE99 for ; Tue, 19 Apr 2022 11:13:38 +0300 (EEST) Received: by mail-lj1-f178.google.com with SMTP id o16so19527515ljp.3 for ; Tue, 19 Apr 2022 01:13:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20210112; h=from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=TZqQ4RymPfdaOCxHZyZ1f+OkAftJl/1dmzc8f4qgbuY=; b=FKpkP4ld3hNx55WkRes9DIItYVi/vbwVYaKDI4LShmQ8xGfdLQDJ4iElbMce1p/QBy ULqdK/kjl1Qvr7F3RnAOdkDhD5eC2X1YAkvftYGA+XUnDC/E/LAB80DPgUnCQlLZlkl3 BjgKU4kTnboTF+uNV4bzaDJAno7t2YijrDZFlLzQk4IG8nFvGflcdN5eF7kAdwNvC9gX v3ON0wWXS8UVAtenxF/7wnI/tO9kvsHE2uWX04CFeWUylx0ETMwpkEmU3UkztmwRiKUc G4+Qc6+khCP0fxLBu7TSEt1AAhquUmFYYhCVJWKklrEs5xJHbRFeFgFOyi61sIRkLubf K7fg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:from:to:cc:subject:date:message-id:mime-version :content-transfer-encoding; bh=TZqQ4RymPfdaOCxHZyZ1f+OkAftJl/1dmzc8f4qgbuY=; b=hCJOglcufzjj5oCETO6gzDAkF7Z26CtPYkX6iEkgcwX7YOnocH78efoQ0QSyr+v7Q4 r/9z0Oob+/b1om+97uz42r60adMAVE+pN0ekxFCcML6VvTyF536on5Krd2voi85Q+X01 qipcNcImQiGCtzH03Bj7rOiSTnDNZEnUIo+BGVulY+eVwP5VGINJekGeAtwadvD1tm6C fm4ZwRwBIUGZLZ2Xf32bL2stjroTN4Raueapxqts3zvqkrFh7UIa0kZiVCCFH7afsXb7 Eaf3y0tzlBhpSdjgE64z3rQc9IKUfHCrhoN/YwrNGwhpx0yBRizk3SsTlN+lTl2dz5su ljiQ== X-Gm-Message-State: AOAM533lrVwuGLYfPmrQUAbFiAAdVZHqZFI3PwjAzpz75wFC8T7Tmq2L 5FF5XbEbG9heY0cr1aMDfV13nmy5dM1vFg== X-Google-Smtp-Source: ABdhPJxgrSgk3wmHjHZpqqTQpLXZJHOLzIUyp7c3gcsfNVR5patCOIm6qFTz8/ROwVRNY82TLirwzA== X-Received: by 2002:a05:651c:1185:b0:24d:a008:46f0 with SMTP id w5-20020a05651c118500b0024da00846f0mr9314956ljo.408.1650356017261; Tue, 19 Apr 2022 01:13:37 -0700 (PDT) Received: from localhost.localdomain (deedock.humlab.lu.se. [130.235.135.183]) by smtp.gmail.com with ESMTPSA id t5-20020a05651c204500b0024d9c71c0basm1407411ljo.92.2022.04.19.01.13.36 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 19 Apr 2022 01:13:36 -0700 (PDT) From: Diederick Niehorster To: ffmpeg-devel@ffmpeg.org Date: Tue, 19 Apr 2022 10:13:18 +0200 Message-Id: <20220419081318.729-1-dcnieho@gmail.com> X-Mailer: git-send-email 2.28.0.windows.1 MIME-Version: 1.0 Subject: [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 Cc: Diederick Niehorster 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: 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; } -- 2.28.0.windows.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".