summaryrefslogtreecommitdiff
path: root/include/media
diff options
context:
space:
mode:
authorEzequiel Garcia <ezequiel@collabora.com>2020-11-26 12:36:13 +0300
committerMauro Carvalho Chehab <mchehab+huawei@kernel.org>2020-12-03 14:27:33 +0300
commit95e95ebe9119dcdf04e8aa9e1d9e8de4f1150c67 (patch)
tree0b34a57e9d298aa08e26bcb55c0101428f5f0315 /include/media
parent008d2bd6e96b5a7e80dacfb02cd182c3839ce819 (diff)
downloadlinux-95e95ebe9119dcdf04e8aa9e1d9e8de4f1150c67.tar.xz
media: uapi: Move parsed H264 pixel format out of staging
Since we are ready to stabilize the H264 stateless API, start by first moving the parsed H264 pixel format. Signed-off-by: Ezequiel Garcia <ezequiel@collabora.com> Tested-by: Jernej Skrabec <jernej.skrabec@siol.net> Signed-off-by: Hans Verkuil <hverkuil-cisco@xs4all.nl> Signed-off-by: Mauro Carvalho Chehab <mchehab+huawei@kernel.org>
Diffstat (limited to 'include/media')
-rw-r--r--include/media/h264-ctrls.h3
1 files changed, 0 insertions, 3 deletions
diff --git a/include/media/h264-ctrls.h b/include/media/h264-ctrls.h
index 083899c3ea19..d98c5b885379 100644
--- a/include/media/h264-ctrls.h
+++ b/include/media/h264-ctrls.h
@@ -21,9 +21,6 @@
#define V4L2_H264_REF_LIST_LEN (2 * V4L2_H264_NUM_DPB_ENTRIES)
-/* Our pixel format isn't stable at the moment */
-#define V4L2_PIX_FMT_H264_SLICE v4l2_fourcc('S', '2', '6', '4') /* H264 parsed slices */
-
/*
* This is put insanely high to avoid conflicting with controls that
* would be added during the phase where those controls are not