summaryrefslogtreecommitdiff
path: root/fftools/opt_common.c
diff options
context:
space:
mode:
authorJames Almer <jamrial@gmail.com>2022-09-12 09:57:56 -0300
committerJames Almer <jamrial@gmail.com>2022-09-14 09:54:19 -0300
commit130483449ebec8fd8d9080d564f7ec5d46e18d39 (patch)
tree6a3b77bb5dd20c501d7bcb8ce58ae8972a8354a8 /fftools/opt_common.c
parent9903ba28c28ab18dc7b7b6fb8571cc8b5caae1a6 (diff)
downloadffmpeg-130483449ebec8fd8d9080d564f7ec5d46e18d39.tar.gz
fftools/opt_common: check the return value of av_hwdevice_get_type_name before printing it
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>
Diffstat (limited to 'fftools/opt_common.c')
-rw-r--r--fftools/opt_common.c5
1 files changed, 4 insertions, 1 deletions
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");
}