Good morning,

can someone merge this little fix?

Best
Jens

-----Original Message-----
From: ffmpeg-devel <ffmpeg-devel-boun...@ffmpeg.org> On Behalf Of Roger Pack
Sent: Wednesday, July 17, 2024 3:03 AM
To: FFmpeg development discussions and patches <ffmpeg-devel@ffmpeg.org>
Subject: Re: [FFmpeg-devel] [PATCH] avdevice/dshow: Don't skip audio devices if 
no video device is present

[You don't often get email from rogerdpa...@gmail.com. Learn why this is 
important at https://aka.ms/LearnAboutSenderIdentification ]

LGTM

On Mon, Jul 15, 2024 at 12:51 AM patches via ffmpeg-devel 
<ffmpeg-devel@ffmpeg.org> wrote:
>
> The search of the current DirectShow device list has been customized 
> so that audio devices are always found even if no video device is connected.
>
> Signed-off-by: Jens Frederich <jens.freder...@vector.com>
> ---
>  libavdevice/dshow.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/libavdevice/dshow.c b/libavdevice/dshow.c index 
> 403e56fe13..57d8e1c0af 100644
> --- a/libavdevice/dshow.c
> +++ b/libavdevice/dshow.c
> @@ -645,7 +645,7 @@ static int dshow_get_device_list(AVFormatContext *avctx, 
> AVDeviceInfoList *devic
>      }
>
>      ret = dshow_cycle_devices(avctx, devenum, VideoDevice, 
> VideoSourceDevice, NULL, NULL, &device_list);
> -    if (ret < S_OK)
> +    if (ret < S_OK && ret != AVERROR(EIO))
>          goto error;
>      ret = dshow_cycle_devices(avctx, devenum, AudioDevice, 
> AudioSourceDevice, NULL, NULL, &device_list);
>
> --
> 2.43.0
>
> _______________________________________________
> 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".
_______________________________________________
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".

Reply via email to