summaryrefslogtreecommitdiffstats
path: root/stream/tvi_def.h
diff options
context:
space:
mode:
authorPhilip Langdale <philipl@overt.org>2018-03-03 11:57:41 -0800
committerKevin Mitchell <kevmitch@gmail.com>2018-03-04 16:28:24 -0800
commitf0223e1b835894a20989523555a0f4e19cd36619 (patch)
treef3f818ef6e9cf0588890a772f5944c6f237524b6 /stream/tvi_def.h
parent496b13227b7f4b47a660bbf4e314f9a55b7e8867 (diff)
downloadmpv-f0223e1b835894a20989523555a0f4e19cd36619.tar.bz2
mpv-f0223e1b835894a20989523555a0f4e19cd36619.tar.xz
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.
Diffstat (limited to 'stream/tvi_def.h')
-rw-r--r--stream/tvi_def.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/stream/tvi_def.h b/stream/tvi_def.h
index 97d0982c94..0794b7eb91 100644
--- a/stream/tvi_def.h
+++ b/stream/tvi_def.h
@@ -79,6 +79,7 @@ static inline void fill_blank_frame(char* buffer,int len,int fmt){
}
break;
case MP_FOURCC_MJPEG:
+ case MP_FOURCC_JPEG:
/*
This is compressed format. I don't know yet how to fill such frame with blue color.
Keeping frame unchanged.