[media] s2255drv: adding MJPEG format

adding MJPEG format

Signed-off-by: Dean Anderson <linux-dev@sensoray.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

diff --git a/drivers/media/video/s2255drv.c b/drivers/media/video/s2255drv.c
index 01a98c0d3950166204fdac91b302c366b46a9772..46506d8381a2562c4593f524cef204b325aed2b7 100644 (file)
--- a/drivers/media/video/s2255drv.c
+++ b/drivers/media/video/s2255drv.c
@@ -432,6 +432,10 @@ static const struct s2255_fmt formats[] = {
                .name = "JPG",
                .fourcc = V4L2_PIX_FMT_JPEG,
                .depth = 24
+       }, {
+               .name = "MJPG",
+               .fourcc = V4L2_PIX_FMT_MJPEG,
+               .depth = 24
        }, {
                .name = "8bpp GREY",
                .fourcc = V4L2_PIX_FMT_GREY,
@@ -653,6 +657,7 @@ static void s2255_fillbuff(struct s2255_channel *channel,
                        memcpy(vbuf, tmpbuf, buf->vb.width * buf->vb.height);
                        break;
                case V4L2_PIX_FMT_JPEG:
+               case V4L2_PIX_FMT_MJPEG:
                        buf->vb.size = jpgsize;
                        memcpy(vbuf, tmpbuf, buf->vb.size);
                        break;
@@ -1037,6 +1042,7 @@ static int vidioc_s_fmt_vid_cap(struct file *file, void *priv,
                mode.color |= COLOR_Y8;
                break;
        case V4L2_PIX_FMT_JPEG:
+       case V4L2_PIX_FMT_MJPEG:
                mode.color &= ~MASK_COLOR;
                mode.color |= COLOR_JPG;
                mode.color |= (channel->jc.quality << 8);