Commit 8917a5f6 authored Nov 26, 2020 by Ezequiel Garcia Committed by Mauro Carvalho Chehab Dec 03, 2020

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: 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>

parent 35aaa6e6

drivers/staging/media/hantro/hantro_hw.h

+1 −3

Original line number	Diff line number	Diff line
		@@ -11,9 +11,7 @@

		#include <linux/interrupt.h>
		#include <linux/v4l2-controls.h>
		#include <media/h264-ctrls.h>
		#include <media/mpeg2-ctrls.h>
		#include <media/vp8-ctrls.h>
		#include <media/v4l2-ctrls.h>
		#include <media/videobuf2-core.h>

		#define DEC_8190_ALIGN_MASK 0x07U

include/media/v4l2-h264.h

+1 −1

Original line number	Diff line number	Diff line
		@@ -10,7 +10,7 @@
		#ifndef _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