CHROMIUM: [media] v4l2-ioctl: add vp8 frame & h264 slice to VIDIOC_ENUM_FMT

Change-Id: Idcfa80d3c838e3b2da1107800b178dc6e8d82dc1
Signed-off-by: Jeffy Chen <jeffy.chen@rock-chips.com>
Signed-off-by: Yakir Yang <ykk@rock-chips.com>

diff --git a/drivers/media/v4l2-core/v4l2-ioctl.c b/drivers/media/v4l2-core/v4l2-ioctl.c
index 6652b1500f5d2bb3598395f9ff9147a7805e97ad..8ac67d52063ca5768e9e6943f3d50e286c84965e 100644 (file)
--- a/drivers/media/v4l2-core/v4l2-ioctl.c
+++ b/drivers/media/v4l2-core/v4l2-ioctl.c
@@ -1242,6 +1242,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
                case V4L2_PIX_FMT_H264:         descr = "H.264"; break;
                case V4L2_PIX_FMT_H264_NO_SC:   descr = "H.264 (No Start Codes)"; break;
                case V4L2_PIX_FMT_H264_MVC:     descr = "H.264 MVC"; break;
+               case V4L2_PIX_FMT_H264_SLICE:   descr = "H.264 SLICE"; break;
                case V4L2_PIX_FMT_H263:         descr = "H.263"; break;
                case V4L2_PIX_FMT_MPEG1:        descr = "MPEG-1 ES"; break;
                case V4L2_PIX_FMT_MPEG2:        descr = "MPEG-2 ES"; break;
@@ -1250,6 +1251,7 @@ static void v4l_fill_fmtdesc(struct v4l2_fmtdesc *fmt)
                case V4L2_PIX_FMT_VC1_ANNEX_G:  descr = "VC-1 (SMPTE 412M Annex G)"; break;
                case V4L2_PIX_FMT_VC1_ANNEX_L:  descr = "VC-1 (SMPTE 412M Annex L)"; break;
                case V4L2_PIX_FMT_VP8:          descr = "VP8"; break;
+               case V4L2_PIX_FMT_VP8_FRAME:    descr = "VP8 FRAME"; break;
                case V4L2_PIX_FMT_CPIA1:        descr = "GSPCA CPiA YUV"; break;
                case V4L2_PIX_FMT_WNVA:         descr = "WNVA"; break;
                case V4L2_PIX_FMT_SN9C10X:      descr = "GSPCA SN9C10X"; break;