vcap/dshow: Fix crash on unknown codec

mpiatka · mpiatka · commit a26ac91c2f14 · 2026-04-06T19:39:14.000+02:00
diff --git a/src/video_capture/DirectShowGrabber.cpp b/src/video_capture/DirectShowGrabber.cpp
@@ -515,7 +515,7 @@ vidcap_dshow_probe_internal(device_info **available_cards, int *count,
                         }
 
 			codec_t ug_codec = get_ug_codec(&mediaType->subtype);
-			bool force_rgb = is_codec_opaque(ug_codec) || codec_is_planar(ug_codec) || ug_codec == VIDEO_CODEC_NONE;
+			bool force_rgb = ug_codec == VC_NONE || is_codec_opaque(ug_codec) || codec_is_planar(ug_codec);
 
 			snprintf(cards[card_count - 1].modes[mode_idx].id,
 					sizeof cards[card_count - 1].modes[mode_idx].id,

Original file line number	Diff line number	Diff line change
`@@ -515,7 +515,7 @@ vidcap_dshow_probe_internal(device_info *available_cards, int count,`
`515`	`515`	`}`
`516`	`516`
`517`	`517`	`codec_t ug_codec = get_ug_codec(&mediaType->subtype);`
`518`		`- bool force_rgb = is_codec_opaque(ug_codec) \|\| codec_is_planar(ug_codec) \|\| ug_codec == VIDEO_CODEC_NONE;`
	`518`	`+ bool force_rgb = ug_codec == VC_NONE \|\| is_codec_opaque(ug_codec) \|\| codec_is_planar(ug_codec);`
`519`	`519`
`520`	`520`	`snprintf(cards[card_count - 1].modes[mode_idx].id,`
`521`	`521`	`sizeof cards[card_count - 1].modes[mode_idx].id,`