Commit 8917a5f6 authored by Ezequiel Garcia's avatar Ezequiel Garcia Committed by Mauro Carvalho Chehab

media: Clean stateless control includes

Avoid including h264-ctrls.h, vp8-ctrls.h, etc,
and instead just include v4l2-ctrls.h which does the right
thing.

This is in preparation for moving the stateless controls
out of staging, which will mean removing some of these headers.
Signed-off-by: default avatarEzequiel Garcia <ezequiel@collabora.com>
Tested-by: default avatarJernej Skrabec <jernej.skrabec@siol.net>
Signed-off-by: default avatarHans Verkuil <hverkuil-cisco@xs4all.nl>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab+huawei@kernel.org>
parent 35aaa6e6
...@@ -11,9 +11,7 @@ ...@@ -11,9 +11,7 @@
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/v4l2-controls.h> #include <linux/v4l2-controls.h>
#include <media/h264-ctrls.h> #include <media/v4l2-ctrls.h>
#include <media/mpeg2-ctrls.h>
#include <media/vp8-ctrls.h>
#include <media/videobuf2-core.h> #include <media/videobuf2-core.h>
#define DEC_8190_ALIGN_MASK 0x07U #define DEC_8190_ALIGN_MASK 0x07U
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
#ifndef _MEDIA_V4L2_H264_H #ifndef _MEDIA_V4L2_H264_H
#define _MEDIA_V4L2_H264_H #define _MEDIA_V4L2_H264_H
#include <media/h264-ctrls.h> #include <media/v4l2-ctrls.h>
/** /**
* struct v4l2_h264_reflist_builder - Reference list builder object * struct v4l2_h264_reflist_builder - Reference list builder object
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment