From f0223e1b835894a20989523555a0f4e19cd36619 Mon Sep 17 00:00:00 2001 From: Philip Langdale Date: Sat, 3 Mar 2018 11:57:41 -0800 Subject: tv: Recognise v4l2 'JPEG' fourcc Naturally, there's more than one fourcc that indicates an mjpeg stream. I have a particular ancient webcam here (Logitech QuickCam Messanger) that only supports the single 'JPEG' format, but there are other devices out there which support both 'JPEG' and 'MJPG' with no visible differences, and others where the streams are slightly different. Regardless of those details, it remains correct to treat 'JPEG' the same as 'MJPG' from a stream consumption perspective. --- stream/tv.h | 1 + 1 file changed, 1 insertion(+) (limited to 'stream/tv.h') diff --git a/stream/tv.h b/stream/tv.h index f37e715515..94b7f01887 100644 --- a/stream/tv.h +++ b/stream/tv.h @@ -280,5 +280,6 @@ extern const struct m_sub_options tv_params_conf; #define MP_FOURCC_YUY2 MP_FOURCC('Y', 'U', 'Y', '2') #define MP_FOURCC_MJPEG MP_FOURCC('M', 'J', 'P', 'G') +#define MP_FOURCC_JPEG MP_FOURCC('J', 'P', 'E', 'G') #endif /* MPLAYER_TV_H */ -- cgit v1.2.3