vcap/v4l2: fixed conversion of fmt unknown to UG

MartinPulec · MartinPulec · commit 49ddf94410a4 · 2024-01-22T16:52:36.000+01:00
The V4L2 FourCC was an invalid codec_t element and lead to crash in
get_codec_name() on that value few lines below.
diff --git a/src/video_capture/v4l2.c b/src/video_capture/v4l2.c
@@ -693,8 +693,7 @@ static int vidcap_v4l2_init(struct vidcap_params *params, void **state)
                         memcpy(fcc, &fmt.fmt.pix.pixelformat, 4);
                         fcc[4] = '\0';
                         log_msg(LOG_LEVEL_WARNING, MOD_NAME "No mapping for FCC '%s', converting to RGB!\n", fcc);
-                        opts.v4l2_convert_to = s->dst_fmt.fmt.pix.pixelformat =
-                            V4L2_PIX_FMT_RGB24;
+                        opts.v4l2_convert_to = RGB;
                 }
         }
         if (opts.v4l2_convert_to != VC_NONE) {

Original file line number	Diff line number	Diff line change
`@@ -693,8 +693,7 @@ static int vidcap_v4l2_init(struct vidcap_params params, void *state)`
`693`	`693`	`memcpy(fcc, &fmt.fmt.pix.pixelformat, 4);`
`694`	`694`	`fcc[4] = '\0';`
`695`	`695`	`log_msg(LOG_LEVEL_WARNING, MOD_NAME "No mapping for FCC '%s', converting to RGB!\n", fcc);`
`696`		`- opts.v4l2_convert_to = s->dst_fmt.fmt.pix.pixelformat =`
`697`		`- V4L2_PIX_FMT_RGB24;`
	`696`	`+ opts.v4l2_convert_to = RGB;`
`698`	`697`	`}`
`699`	`698`	`}`
`700`	`699`	`if (opts.v4l2_convert_to != VC_NONE) {`