From: Hans Verkuil Date: Thu, 28 Jun 2018 13:03:42 +0000 (-0400) Subject: media: media.h: reorder video en/decoder functions X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=f2399f7522ac2a255f6502537609a51974be84be;p=openwrt%2Fstaging%2Fblogic.git media: media.h: reorder video en/decoder functions Keep the function defines in numerical order: 0x6000 comes after 0x2000, so move it back. Signed-off-by: Hans Verkuil Reviewed-by: Laurent Pinchart Signed-off-by: Mauro Carvalho Chehab --- diff --git a/include/uapi/linux/media.h b/include/uapi/linux/media.h index 6f594fa238c2..76d9bd64c116 100644 --- a/include/uapi/linux/media.h +++ b/include/uapi/linux/media.h @@ -89,13 +89,6 @@ struct media_device_info { #define MEDIA_ENT_F_FLASH (MEDIA_ENT_F_OLD_SUBDEV_BASE + 2) #define MEDIA_ENT_F_LENS (MEDIA_ENT_F_OLD_SUBDEV_BASE + 3) -/* - * Video decoder/encoder functions - */ -#define MEDIA_ENT_F_ATV_DECODER (MEDIA_ENT_F_OLD_SUBDEV_BASE + 4) -#define MEDIA_ENT_F_DV_DECODER (MEDIA_ENT_F_BASE + 0x6001) -#define MEDIA_ENT_F_DV_ENCODER (MEDIA_ENT_F_BASE + 0x6002) - /* * Digital TV, analog TV, radio and/or software defined radio tuner functions. * @@ -140,6 +133,13 @@ struct media_device_info { #define MEDIA_ENT_F_VID_MUX (MEDIA_ENT_F_BASE + 0x5001) #define MEDIA_ENT_F_VID_IF_BRIDGE (MEDIA_ENT_F_BASE + 0x5002) +/* + * Video decoder/encoder functions + */ +#define MEDIA_ENT_F_ATV_DECODER (MEDIA_ENT_F_OLD_SUBDEV_BASE + 4) +#define MEDIA_ENT_F_DV_DECODER (MEDIA_ENT_F_BASE + 0x6001) +#define MEDIA_ENT_F_DV_ENCODER (MEDIA_ENT_F_BASE + 0x6002) + /* Entity flags */ #define MEDIA_ENT_FL_DEFAULT (1 << 0) #define MEDIA_ENT_FL_CONNECTOR (1 << 1)