| Message ID | 20220419081318.729-1-dcnieho@gmail.com |
|---|---|
| State | Accepted |
| Commit | d2d8b9b972ba2df6b2a2ebe29f5307cbb7a69c33 |
| Headers | show |
| Series | [FFmpeg-devel] avdevice/dshow: reuse unused variables. | expand |
| Context | Check | Description |
|---|---|---|
| yinshiyou/make_loongarch64 | success | Make finished |
| yinshiyou/make_fate_loongarch64 | success | Make fate finished |
| andriy/make_x86 | success | Make finished |
| andriy/make_fate_x86 | success | Make fate finished |
| andriy/make_armv7_RPi4 | success | Make finished |
| andriy/make_fate_armv7_RPi4 | success | Make fate finished |
Ping for the below. On Tue, Apr 19, 2022 at 10:13 AM Diederick Niehorster <dcnieho@gmail.com> wrote: > > Fix for f125c504d8fece6420bb97767f9e72414c26312a, requested_sample_rate > and such should be used. > > Signed-off-by: Diederick Niehorster <dcnieho@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; > } > -- > 2.28.0.windows.1 >
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 <dcnieho@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.
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 <dcnieho@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.
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; }
Fix for f125c504d8fece6420bb97767f9e72414c26312a, requested_sample_rate and such should be used. Signed-off-by: Diederick Niehorster <dcnieho@gmail.com> --- libavdevice/dshow.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)