diff --git a/spa/include/spa/param/format.h b/spa/include/spa/param/format.h
index d7af730e4..2ca77c58d 100644
--- a/spa/include/spa/param/format.h
+++ b/spa/include/spa/param/format.h
@@ -73,10 +73,10 @@ enum spa_media_subtype {
 	SPA_MEDIA_SUBTYPE_vc1,
 	SPA_MEDIA_SUBTYPE_vp8,
 	SPA_MEDIA_SUBTYPE_vp9,
-	SPA_MEDIA_SUBTYPE_jpeg,
 	SPA_MEDIA_SUBTYPE_bayer,
 
 	SPA_MEDIA_SUBTYPE_START_Image	= 0x30000,
+	SPA_MEDIA_SUBTYPE_jpeg,
 
 	SPA_MEDIA_SUBTYPE_START_Binary	= 0x40000,
 
diff --git a/spa/include/spa/param/type-info.h b/spa/include/spa/param/type-info.h
index 56298a2c6..ec50f59ad 100644
--- a/spa/include/spa/param/type-info.h
+++ b/spa/include/spa/param/type-info.h
@@ -183,9 +183,10 @@ static const struct spa_type_info spa_type_media_subtype[] = {
 	{ SPA_MEDIA_SUBTYPE_vc1, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "vc1", NULL },
 	{ SPA_MEDIA_SUBTYPE_vp8, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "vp8", NULL },
 	{ SPA_MEDIA_SUBTYPE_vp9, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "vp9", NULL },
-	{ SPA_MEDIA_SUBTYPE_jpeg, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "jpeg", NULL },
 	{ SPA_MEDIA_SUBTYPE_bayer, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "bayer", NULL },
-
+	/* image subtypes */
+	{ SPA_MEDIA_SUBTYPE_jpeg, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "jpeg", NULL },
+	/* stream subtypes */
 	{ SPA_MEDIA_SUBTYPE_midi, SPA_TYPE_Int, SPA_TYPE_INFO_MEDIA_SUBTYPE_BASE "midi", NULL },
 	{ 0, 0, NULL, NULL },
 };
diff --git a/spa/plugins/v4l2/v4l2-utils.c b/spa/plugins/v4l2/v4l2-utils.c
index 4a170f0b2..51494badd 100644
--- a/spa/plugins/v4l2/v4l2-utils.c
+++ b/spa/plugins/v4l2/v4l2-utils.c
@@ -329,8 +329,8 @@ static const struct format_info format_info[] = {
 
 	/* compressed formats */
 	{V4L2_PIX_FMT_MJPEG, FORMAT_ENCODED, VIDEO, MJPG},
-	{V4L2_PIX_FMT_JPEG, FORMAT_ENCODED, IMAGE, JPEG},
-	{V4L2_PIX_FMT_PJPG, FORMAT_UNKNOWN, VIDEO, RAW},
+	{V4L2_PIX_FMT_JPEG, FORMAT_ENCODED, VIDEO, MJPG},
+	{V4L2_PIX_FMT_PJPG, FORMAT_ENCODED, VIDEO, MJPG},
 	{V4L2_PIX_FMT_DV, FORMAT_ENCODED, VIDEO, DV},
 	{V4L2_PIX_FMT_MPEG, FORMAT_ENCODED, VIDEO, MPEGTS},
 	{V4L2_PIX_FMT_H264, FORMAT_ENCODED, VIDEO, H264},
diff --git a/src/gst/gstpipewireformat.c b/src/gst/gstpipewireformat.c
index e070932bc..761bc1c2b 100644
--- a/src/gst/gstpipewireformat.c
+++ b/src/gst/gstpipewireformat.c
@@ -45,6 +45,7 @@ static const struct media_type media_type_map[] = {
   { "video/x-raw", SPA_MEDIA_TYPE_video, SPA_MEDIA_SUBTYPE_raw },
   { "audio/x-raw", SPA_MEDIA_TYPE_audio, SPA_MEDIA_SUBTYPE_raw },
   { "image/jpeg", SPA_MEDIA_TYPE_video, SPA_MEDIA_SUBTYPE_mjpg },
+  { "video/x-jpeg", SPA_MEDIA_TYPE_video, SPA_MEDIA_SUBTYPE_mjpg },
   { "video/x-h264", SPA_MEDIA_TYPE_video, SPA_MEDIA_SUBTYPE_h264 },
   { NULL, }
 };