[FFmpeg-devel] [PATCH] fftools/opt_common: check the return value of av_hwdevice_get_type_name before printing it

[FFmpeg-devel] [PATCH] fftools/opt_common: check the return value of av_hwdevice_get_type_name before printing it

[James Almer]

It may be NULL, as is the case for D3D11VA_VLD.

Running "ffmpeg -h decoder=h264" on a Windows build

Before:
Decoder h264 [H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10]:
    Supported hardware devices: dxva2 (null) d3d11va cuda

After:
Decoder h264 [H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10]:
    Supported hardware devices: dxva2 d3d11va cuda

Signed-off-by: James Almer <jamrial@gmail.com>
---
 fftools/opt_common.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/fftools/opt_common.c b/fftools/opt_common.c
index 7cd8b1c66e..8a06df82df 100644
--- a/fftools/opt_common.c
+++ b/fftools/opt_common.c
@@ -335,9 +335,12 @@ static void print_codec(const AVCodec *c)
         printf("    Supported hardware devices: ");
         for (int i = 0;; i++) {
             const AVCodecHWConfig *config = avcodec_get_hw_config(c, i);
+            const char *name;
             if (!config)
                 break;
-            printf("%s ", av_hwdevice_get_type_name(config->device_type));
+            name = av_hwdevice_get_type_name(config->device_type);
+            if (name)
+                printf("%s ", name);
         }
         printf("\n");
     }
-- 
2.37.3

_______________________________________________
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".

Re: [FFmpeg-devel] [PATCH] fftools/opt_common: check the return value of av_hwdevice_get_type_name before printing it

[James Almer]

On 9/12/2022 10:02 AM, James Almer wrote:
> It may be NULL, as is the case for D3D11VA_VLD.
> 
> Running "ffmpeg -h decoder=h264" on a Windows build
> 
> Before:
> Decoder h264 [H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10]:
>      Supported hardware devices: dxva2 (null) d3d11va cuda
> 
> After:
> Decoder h264 [H.264 / AVC / MPEG-4 AVC / MPEG-4 part 10]:
>      Supported hardware devices: dxva2 d3d11va cuda
> 
> Signed-off-by: James Almer <jamrial@gmail.com>
> ---
>   fftools/opt_common.c | 5 ++++-
>   1 file changed, 4 insertions(+), 1 deletion(-)
> 
> diff --git a/fftools/opt_common.c b/fftools/opt_common.c
> index 7cd8b1c66e..8a06df82df 100644
> --- a/fftools/opt_common.c
> +++ b/fftools/opt_common.c
> @@ -335,9 +335,12 @@ static void print_codec(const AVCodec *c)
>           printf("    Supported hardware devices: ");
>           for (int i = 0;; i++) {
>               const AVCodecHWConfig *config = avcodec_get_hw_config(c, i);
> +            const char *name;
>               if (!config)
>                   break;
> -            printf("%s ", av_hwdevice_get_type_name(config->device_type));
> +            name = av_hwdevice_get_type_name(config->device_type);
> +            if (name)
> +                printf("%s ", name);
>           }
>           printf("\n");
>       }

Applied.
_______________________________________________
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".