diff options
| author |  Philip Langdale <philipl@overt.org> | 2018-03-03 11:57:41 -0800 |
|---|---|---|
| committer |  Kevin Mitchell <kevmitch@gmail.com> | 2018-03-04 16:28:24 -0800 |
| commit | f0223e1b835894a20989523555a0f4e19cd36619 (patch) | |
| tree | f3f818ef6e9cf0588890a772f5944c6f237524b6 /demux | |
| parent | 496b13227b7f4b47a660bbf4e314f9a55b7e8867 (diff) | |
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 'demux')
| -rw-r--r-- | demux/demux_tv.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/demux/demux_tv.c b/demux/demux_tv.c index e9ed2b48e7..0e9bee4317 100644 --- a/demux/demux_tv.c +++ b/demux/demux_tv.c @@ -85,7 +85,7 @@ static int demux_open_tv(demuxer_t *demuxer, enum demux_check check) /* get IMAGE FORMAT */ int fourcc; funcs->control(tvh->priv, TVI_CONTROL_VID_GET_FORMAT, &fourcc); - if (fourcc == MP_FOURCC_MJPEG) { + if (fourcc == MP_FOURCC_MJPEG || fourcc == MP_FOURCC_JPEG) { sh_v->codec->codec = "mjpeg"; } else { sh_v->codec->codec = "rawvideo"; |