[FFmpeg-cvslog] avdevice/dshow: reuse unused variables.

Diederick Niehorster git at videolan.org
Fri May 13 04:07:30 EEST 2022


ffmpeg | branch: master | Diederick Niehorster <dcnieho at gmail.com> | Tue Apr 19 10:13:18 2022 +0200| [d2d8b9b972ba2df6b2a2ebe29f5307cbb7a69c33] | committer: James Almer

avdevice/dshow: reuse unused variables.

Fix for f125c504d8fece6420bb97767f9e72414c26312a, requested_sample_rate
and such should be used.

Signed-off-by: Diederick Niehorster <dcnieho at gmail.com>
Signed-off-by: James Almer <jamrial at gmail.com>

> http://git.videolan.org/gitweb.cgi/ffmpeg.git/?a=commit;h=d2d8b9b972ba2df6b2a2ebe29f5307cbb7a69c33
---

 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;
             }



More information about the ffmpeg-cvslog mailing list