* [FFmpeg-devel] [PATCH 1/2] avdevice/dshow: remove unused variables
@ 2022-04-13 16:15 James Almer
2022-04-13 16:15 ` [FFmpeg-devel] [PATCH 2/2] avdevice/dshow: silence warnings about unused variable James Almer
2022-04-19 6:10 ` [FFmpeg-devel] [PATCH 1/2] avdevice/dshow: remove unused variables Roger Pack
0 siblings, 2 replies; 6+ messages in thread
From: James Almer @ 2022-04-13 16:15 UTC (permalink / raw)
To: ffmpeg-devel
Remnant from f125c504d8fece6420bb97767f9e72414c26312a
Signed-off-by: James Almer <jamrial@gmail.com>
---
libavdevice/dshow.c | 8 --------
1 file changed, 8 deletions(-)
diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c
index 1e69620880..ac8b64366f 100644
--- a/libavdevice/dshow.c
+++ b/libavdevice/dshow.c
@@ -814,10 +814,6 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype,
/ ctx->requested_framerate.num : 0;
int requested_width = ctx->requested_width;
int requested_height = ctx->requested_height;
- // audio
- int requested_sample_rate = ctx->sample_rate;
- int requested_sample_size = ctx->sample_size;
- int requested_channels = ctx->channels;
if (IPin_QueryInterface(pin, &IID_IAMStreamConfig, (void **) &config) != S_OK)
return;
@@ -854,10 +850,6 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype,
requested_framerate = fmt_info->framerate;
requested_width = fmt_info->width;
requested_height = fmt_info->height;
- } else {
- requested_sample_rate = fmt_info->sample_rate;
- requested_sample_size = fmt_info->sample_size;
- requested_channels = fmt_info->channels;
}
av_free(fmt_info); // free but don't set to NULL to enable below check
}
--
2.35.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".
^ permalink raw reply [flat|nested] 6+ messages in thread
* [FFmpeg-devel] [PATCH 2/2] avdevice/dshow: silence warnings about unused variable
2022-04-13 16:15 [FFmpeg-devel] [PATCH 1/2] avdevice/dshow: remove unused variables James Almer
@ 2022-04-13 16:15 ` James Almer
2022-04-19 6:05 ` Roger Pack
2022-04-19 6:10 ` [FFmpeg-devel] [PATCH 1/2] avdevice/dshow: remove unused variables Roger Pack
1 sibling, 1 reply; 6+ messages in thread
From: James Almer @ 2022-04-13 16:15 UTC (permalink / raw)
To: ffmpeg-devel
Use av_unused instead of wrapping the declaration under the DSHOWDEBUG check
in case future changes make use of it.
Signed-off-by: James Almer <jamrial@gmail.com>
---
libavdevice/dshow.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c
index ac8b64366f..6277a27453 100644
--- a/libavdevice/dshow.c
+++ b/libavdevice/dshow.c
@@ -976,7 +976,7 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype,
}
} else {
WAVEFORMATEX *fx;
- AUDIO_STREAM_CONFIG_CAPS *acaps = caps;
+ AUDIO_STREAM_CONFIG_CAPS av_unused *acaps = caps;
#if DSHOWDEBUG
ff_print_AUDIO_STREAM_CONFIG_CAPS(acaps);
#endif
--
2.35.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".
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [FFmpeg-devel] [PATCH 2/2] avdevice/dshow: silence warnings about unused variable
2022-04-13 16:15 ` [FFmpeg-devel] [PATCH 2/2] avdevice/dshow: silence warnings about unused variable James Almer
@ 2022-04-19 6:05 ` Roger Pack
2022-04-19 11:19 ` James Almer
0 siblings, 1 reply; 6+ messages in thread
From: Roger Pack @ 2022-04-19 6:05 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On Wed, Apr 13, 2022 at 10:15 AM James Almer <jamrial@gmail.com> wrote:
>
> Use av_unused instead of wrapping the declaration under the DSHOWDEBUG check
> in case future changes make use of it.
>
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
> libavdevice/dshow.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c
> index ac8b64366f..6277a27453 100644
> --- a/libavdevice/dshow.c
> +++ b/libavdevice/dshow.c
> @@ -976,7 +976,7 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype,
> }
> } else {
> WAVEFORMATEX *fx;
> - AUDIO_STREAM_CONFIG_CAPS *acaps = caps;
> + AUDIO_STREAM_CONFIG_CAPS av_unused *acaps = caps;
> #if DSHOWDEBUG
> ff_print_AUDIO_STREAM_CONFIG_CAPS(acaps);
> #endif
Or maybe put it within the #if ? Just an idea.
_______________________________________________
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".
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [FFmpeg-devel] [PATCH 1/2] avdevice/dshow: remove unused variables
2022-04-13 16:15 [FFmpeg-devel] [PATCH 1/2] avdevice/dshow: remove unused variables James Almer
2022-04-13 16:15 ` [FFmpeg-devel] [PATCH 2/2] avdevice/dshow: silence warnings about unused variable James Almer
@ 2022-04-19 6:10 ` Roger Pack
2022-04-19 7:09 ` Diederick C. Niehorster
1 sibling, 1 reply; 6+ messages in thread
From: Roger Pack @ 2022-04-19 6:10 UTC (permalink / raw)
To: FFmpeg development discussions and patches
LGTM.
On Wed, Apr 13, 2022 at 10:15 AM James Almer <jamrial@gmail.com> wrote:
>
> Remnant from f125c504d8fece6420bb97767f9e72414c26312a
>
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
> libavdevice/dshow.c | 8 --------
> 1 file changed, 8 deletions(-)
>
> diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c
> index 1e69620880..ac8b64366f 100644
> --- a/libavdevice/dshow.c
> +++ b/libavdevice/dshow.c
> @@ -814,10 +814,6 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype,
> / ctx->requested_framerate.num : 0;
> int requested_width = ctx->requested_width;
> int requested_height = ctx->requested_height;
> - // audio
> - int requested_sample_rate = ctx->sample_rate;
> - int requested_sample_size = ctx->sample_size;
> - int requested_channels = ctx->channels;
>
> if (IPin_QueryInterface(pin, &IID_IAMStreamConfig, (void **) &config) != S_OK)
> return;
> @@ -854,10 +850,6 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype,
> requested_framerate = fmt_info->framerate;
> requested_width = fmt_info->width;
> requested_height = fmt_info->height;
> - } else {
> - requested_sample_rate = fmt_info->sample_rate;
> - requested_sample_size = fmt_info->sample_size;
> - requested_channels = fmt_info->channels;
> }
> av_free(fmt_info); // free but don't set to NULL to enable below check
> }
> --
> 2.35.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".
_______________________________________________
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".
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [FFmpeg-devel] [PATCH 1/2] avdevice/dshow: remove unused variables
2022-04-19 6:10 ` [FFmpeg-devel] [PATCH 1/2] avdevice/dshow: remove unused variables Roger Pack
@ 2022-04-19 7:09 ` Diederick C. Niehorster
0 siblings, 0 replies; 6+ messages in thread
From: Diederick C. Niehorster @ 2022-04-19 7:09 UTC (permalink / raw)
To: FFmpeg development discussions and patches
On Tue, Apr 19, 2022 at 8:10 AM Roger Pack <rogerdpack2@gmail.com> wrote:
>
> LGTM.
Not LGTM, see below
> On Wed, Apr 13, 2022 at 10:15 AM James Almer <jamrial@gmail.com> wrote:
> >
> > Remnant from f125c504d8fece6420bb97767f9e72414c26312a
> >
> > Signed-off-by: James Almer <jamrial@gmail.com>
> > ---
> > libavdevice/dshow.c | 8 --------
> > 1 file changed, 8 deletions(-)
> >
> > diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c
> > index 1e69620880..ac8b64366f 100644
> > --- a/libavdevice/dshow.c
> > +++ b/libavdevice/dshow.c
> > @@ -814,10 +814,6 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype,
> > / ctx->requested_framerate.num : 0;
> > int requested_width = ctx->requested_width;
> > int requested_height = ctx->requested_height;
> > - // audio
> > - int requested_sample_rate = ctx->sample_rate;
> > - int requested_sample_size = ctx->sample_size;
> > - int requested_channels = ctx->channels;
> >
> > if (IPin_QueryInterface(pin, &IID_IAMStreamConfig, (void **) &config) != S_OK)
> > return;
> > @@ -854,10 +850,6 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype,
> > requested_framerate = fmt_info->framerate;
> > requested_width = fmt_info->width;
> > requested_height = fmt_info->height;
> > - } else {
> > - requested_sample_rate = fmt_info->sample_rate;
> > - requested_sample_size = fmt_info->sample_size;
> > - requested_channels = fmt_info->channels;
> > }
> > av_free(fmt_info); // free but don't set to NULL to enable below check
> > }
These should be used further down when checking audio formats. I'll
send a patch.
Cheers,
Dee
_______________________________________________
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".
^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [FFmpeg-devel] [PATCH 2/2] avdevice/dshow: silence warnings about unused variable
2022-04-19 6:05 ` Roger Pack
@ 2022-04-19 11:19 ` James Almer
0 siblings, 0 replies; 6+ messages in thread
From: James Almer @ 2022-04-19 11:19 UTC (permalink / raw)
To: ffmpeg-devel
On 4/19/2022 3:05 AM, Roger Pack wrote:
> On Wed, Apr 13, 2022 at 10:15 AM James Almer <jamrial@gmail.com> wrote:
>>
>> Use av_unused instead of wrapping the declaration under the DSHOWDEBUG check
>> in case future changes make use of it.
>>
>> Signed-off-by: James Almer <jamrial@gmail.com>
>> ---
>> libavdevice/dshow.c | 2 +-
>> 1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c
>> index ac8b64366f..6277a27453 100644
>> --- a/libavdevice/dshow.c
>> +++ b/libavdevice/dshow.c
>> @@ -976,7 +976,7 @@ dshow_cycle_formats(AVFormatContext *avctx, enum dshowDeviceType devtype,
>> }
>> } else {
>> WAVEFORMATEX *fx;
>> - AUDIO_STREAM_CONFIG_CAPS *acaps = caps;
>> + AUDIO_STREAM_CONFIG_CAPS av_unused *acaps = caps;
>> #if DSHOWDEBUG
>> ff_print_AUDIO_STREAM_CONFIG_CAPS(acaps);
>> #endif
>
> Or maybe put it within the #if ? Just an idea.
I mentioned as much in the commit message, but figured it would be nicer
to not do it in case it's needed later. But ok, will go that route instead.
> _______________________________________________
> 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".
_______________________________________________
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".
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2022-04-19 11:19 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-04-13 16:15 [FFmpeg-devel] [PATCH 1/2] avdevice/dshow: remove unused variables James Almer
2022-04-13 16:15 ` [FFmpeg-devel] [PATCH 2/2] avdevice/dshow: silence warnings about unused variable James Almer
2022-04-19 6:05 ` Roger Pack
2022-04-19 11:19 ` James Almer
2022-04-19 6:10 ` [FFmpeg-devel] [PATCH 1/2] avdevice/dshow: remove unused variables Roger Pack
2022-04-19 7:09 ` Diederick C. Niehorster
Git Inbox Mirror of the ffmpeg-devel mailing list - see https://ffmpeg.org/mailman/listinfo/ffmpeg-devel
This inbox may be cloned and mirrored by anyone:
git clone --mirror https://master.gitmailbox.com/ffmpegdev/0 ffmpegdev/git/0.git
# If you have public-inbox 1.1+ installed, you may
# initialize and index your mirror using the following commands:
public-inbox-init -V2 ffmpegdev ffmpegdev/ https://master.gitmailbox.com/ffmpegdev \
ffmpegdev@gitmailbox.com
public-inbox-index ffmpegdev
Example config snippet for mirrors.
AGPL code for this site: git clone https://public-inbox.org/public-inbox.git