Nicely applied, many thanks! Sent: Sunday, April 24, 2022 at 11:04 PM From: "James Almer" To: ffmpeg-devel@ffmpeg.org Subject: Re: [FFmpeg-devel] [PATCH] avdevice/dshow: reuse unused variables. 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 <dcni...@gmail.com> > --- > 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-requ...@ffmpeg.org with subject "unsubscribe". _______________________________________________ ffmpeg-devel mailing list ffmpeg-devel@ffmpeg.org https://ffmpeg.org/mailman/listinfo/ffmpeg-devel To unsubscribe, visit link above, or email ffmpeg-devel-requ...@ffmpeg.org with subject "unsubscribe".