Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b10c55d8 authored by Laurent Pinchart's avatar Laurent Pinchart Committed by Mauro Carvalho Chehab
Browse files

[media] uvcvideo: Remove duplicate definitions of UVC_STREAM_* macros 



The macros are defined in both drivers/media/video/uvc/uvc_video.c and
include/linux/usb/video.h. Remove definitions from the former.

Signed-off-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@redhat.com>
parent 24c3aae0

drivers/media/video/uvc/uvc_video.c

+0 −10
Original line number Diff line number Diff line
@@ -361,16 +361,6 @@ int uvc_commit_video(struct uvc_streaming *stream, 
 * Video codecs

 */



/* Values for bmHeaderInfo (Video and Still Image Payload Headers, 2.4.3.3) */

#define UVC_STREAM_EOH	(1 << 7)

#define UVC_STREAM_ERR	(1 << 6)

#define UVC_STREAM_STI	(1 << 5)

#define UVC_STREAM_RES	(1 << 4)

#define UVC_STREAM_SCR	(1 << 3)

#define UVC_STREAM_PTS	(1 << 2)

#define UVC_STREAM_EOF	(1 << 1)

#define UVC_STREAM_FID	(1 << 0)



/* Video payload decoding is handled by uvc_video_decode_start(),

 * uvc_video_decode_data() and uvc_video_decode_end().

 *