diff options
author | Gerd Knorr <devnull@localhost> | 2004-10-13 10:38:59 +0000 |
---|---|---|
committer | Gerd Knorr <devnull@localhost> | 2004-10-13 10:38:59 +0000 |
commit | edd4507a9edff255a67ce707442560a4ec4b3b14 (patch) | |
tree | d7c709acacb87b01d70340692df17aebcfbe2913 /linux/include | |
parent | c391a6857f19bd7eb8b9a40dc238242c34332f7a (diff) | |
download | mediapointer-dvb-s2-edd4507a9edff255a67ce707442560a4ec4b3b14.tar.gz mediapointer-dvb-s2-edd4507a9edff255a67ce707442560a4ec4b3b14.tar.bz2 |
- kill trailing whitespaces.
Diffstat (limited to 'linux/include')
-rw-r--r-- | linux/include/linux/videodev.h | 16 | ||||
-rw-r--r-- | linux/include/linux/videodev2.h | 20 | ||||
-rw-r--r-- | linux/include/media/audiochip.h | 2 | ||||
-rw-r--r-- | linux/include/media/saa6752hs.h | 6 | ||||
-rw-r--r-- | linux/include/media/tuner.h | 4 | ||||
-rw-r--r-- | linux/include/media/video-buf.h | 6 |
6 files changed, 27 insertions, 27 deletions
diff --git a/linux/include/linux/videodev.h b/linux/include/linux/videodev.h index 30ab076ce..8c16620df 100644 --- a/linux/include/linux/videodev.h +++ b/linux/include/linux/videodev.h @@ -44,7 +44,7 @@ struct video_device unsigned int (*poll)(struct video_device *, struct file *, poll_table *); int (*ioctl)(struct video_device *, unsigned int , void *); int (*mmap)(struct video_device *, const char *, unsigned long); - int (*initialize)(struct video_device *); + int (*initialize)(struct video_device *); #endif #if 1 /* to be removed in 2.7.x */ @@ -159,7 +159,7 @@ struct video_channel #define VIDEO_VC_AUDIO 2 /* Channel has audio */ __u16 type; #define VIDEO_TYPE_TV 1 -#define VIDEO_TYPE_CAMERA 2 +#define VIDEO_TYPE_CAMERA 2 __u16 norm; /* Norm set by channel */ }; @@ -198,7 +198,7 @@ struct video_picture #define VIDEO_PALETTE_HI240 2 /* High 240 cube (BT848) */ #define VIDEO_PALETTE_RGB565 3 /* 565 16 bit RGB */ #define VIDEO_PALETTE_RGB24 4 /* 24bit RGB */ -#define VIDEO_PALETTE_RGB32 5 /* 32bit RGB */ +#define VIDEO_PALETTE_RGB32 5 /* 32bit RGB */ #define VIDEO_PALETTE_RGB555 6 /* 555 15bit RGB */ #define VIDEO_PALETTE_YUV422 7 /* YUV422 capture */ #define VIDEO_PALETTE_YUYV 8 @@ -224,7 +224,7 @@ struct video_audio #define VIDEO_AUDIO_MUTABLE 2 #define VIDEO_AUDIO_VOLUME 4 #define VIDEO_AUDIO_BASS 8 -#define VIDEO_AUDIO_TREBLE 16 +#define VIDEO_AUDIO_TREBLE 16 #define VIDEO_AUDIO_BALANCE 32 char name[16]; #define VIDEO_SOUND_MONO 1 @@ -298,11 +298,11 @@ struct video_mbuf int frames; /* Frames */ int offsets[VIDEO_MAX_FRAME]; }; - + #define VIDEO_NO_UNIT (-1) - + struct video_unit { int video; /* Video minor */ @@ -399,7 +399,7 @@ struct video_code /* p1: = VIDEO_MODE_PAL, VIDEO_MODE_NTSC, etc ... */ #define VID_PLAY_GENLOCK 1 /* p1: 0 = OFF, 1 = ON */ - /* p2: GENLOCK FINE DELAY value */ + /* p2: GENLOCK FINE DELAY value */ #define VID_PLAY_NORMAL 2 #define VID_PLAY_PAUSE 3 #define VID_PLAY_SINGLE_FRAME 4 @@ -447,7 +447,7 @@ struct video_code #define VID_HARDWARE_CPIA 24 #define VID_HARDWARE_ZR36120 25 /* Zoran ZR36120/ZR36125 */ #define VID_HARDWARE_ZR36067 26 /* Zoran ZR36067/36060 */ -#define VID_HARDWARE_OV511 27 +#define VID_HARDWARE_OV511 27 #define VID_HARDWARE_ZR356700 28 /* Zoran 36700 series */ #define VID_HARDWARE_W9966 29 #define VID_HARDWARE_SE401 30 /* SE401 USB webcams */ diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index 75d838922..15571c046 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -95,20 +95,20 @@ enum v4l2_colorspace { /* HD and modern captures. */ V4L2_COLORSPACE_REC709 = 3, - + /* broken BT878 extents (601, luma range 16-253 instead of 16-235) */ V4L2_COLORSPACE_BT878 = 4, - + /* These should be useful. Assume 601 extents. */ V4L2_COLORSPACE_470_SYSTEM_M = 5, V4L2_COLORSPACE_470_SYSTEM_BG = 6, - + /* I know there will be cameras that send this. So, this is * unspecified chromaticities and full 0-255 on each of the * Y'CbCr components */ V4L2_COLORSPACE_JPEG = 7, - + /* For RGB colourspaces, this is probably a good start. */ V4L2_COLORSPACE_SRGB = 8, }; @@ -319,14 +319,14 @@ struct v4l2_mpeg_compression { /* program stream */ u16 ps_size; u16 reserved_1; /* align */ - + /* audio */ enum v4l2_mpeg_audiotype au_type; struct v4l2_bitrate au_bitrate; u32 au_sample_rate; u8 au_pesid; u8 reserved_2[3]; /* align */ - + /* video */ enum v4l2_mpeg_videotype vi_type; struct v4l2_bitrate vi_bitrate; @@ -354,10 +354,10 @@ struct v4l2_jpegcompression * must be 0..15 */ int APP_len; /* Length of data in JPEG APPn segment */ char APP_data[60]; /* Data in the JPEG APPn segment. */ - + int COM_len; /* Length of data in JPEG COM segment */ char COM_data[60]; /* Data in JPEG COM segment */ - + __u32 jpeg_markers; /* Which markers should go into the JPEG * output. Unless you exactly know what * you do, leave them untouched. @@ -367,7 +367,7 @@ struct v4l2_jpegcompression * The presence of the APP and COM marker * is influenced by APP_len and COM_len * ONLY, not by this property! */ - + #define V4L2_JPEG_MARKER_DHT (1<<3) /* Define Huffman Tables */ #define V4L2_JPEG_MARKER_DQT (1<<4) /* Define Quantization Tables */ #define V4L2_JPEG_MARKER_DRI (1<<5) /* Define Restart Interval */ @@ -490,7 +490,7 @@ struct v4l2_outputparm */ struct v4l2_cropcap { - enum v4l2_buf_type type; + enum v4l2_buf_type type; struct v4l2_rect bounds; struct v4l2_rect defrect; struct v4l2_fract pixelaspect; diff --git a/linux/include/media/audiochip.h b/linux/include/media/audiochip.h index fadc32dab..d3e9e3060 100644 --- a/linux/include/media/audiochip.h +++ b/linux/include/media/audiochip.h @@ -13,7 +13,7 @@ #define AUDIO_RADIO 0x01 #define AUDIO_EXTERN 0x02 #define AUDIO_INTERN 0x03 -#define AUDIO_OFF 0x04 +#define AUDIO_OFF 0x04 #define AUDIO_ON 0x05 #define AUDIO_EXTERN_1 AUDIO_EXTERN #define AUDIO_EXTERN_2 0x06 diff --git a/linux/include/media/saa6752hs.h b/linux/include/media/saa6752hs.h index 8485d2e49..135f9a682 100644 --- a/linux/include/media/saa6752hs.h +++ b/linux/include/media/saa6752hs.h @@ -1,4 +1,4 @@ -/* +/* saa6752hs.h - definition for saa6752hs MPEG encoder Copyright (C) 2003 Andrew de Quincey <adq@lidskialf.net> @@ -31,14 +31,14 @@ enum mpeg_bitrate_mode { enum mpeg_audio_bitrate { MPEG_AUDIO_BITRATE_256 = 0, /* 256 kBit/sec */ MPEG_AUDIO_BITRATE_384 = 1, /* 384 kBit/sec */ - + MPEG_AUDIO_BITRATE_MAX }; #define MPEG_VIDEO_TARGET_BITRATE_MAX 27000 #define MPEG_VIDEO_MAX_BITRATE_MAX 27000 #define MPEG_TOTAL_BITRATE_MAX 27000 - + struct mpeg_params { enum mpeg_bitrate_mode bitrate_mode; unsigned int video_target_bitrate; diff --git a/linux/include/media/tuner.h b/linux/include/media/tuner.h index 2128e8df7..5534d484b 100644 --- a/linux/include/media/tuner.h +++ b/linux/include/media/tuner.h @@ -1,5 +1,5 @@ -/* +/* tuner.h - definition for different tuners Copyright (C) 1997 Markus Schroeder (schroedm@uni-duesseldorf.de) @@ -70,7 +70,7 @@ #define TUNER_PHILIPS_ATSC 42 #define TUNER_PHILIPS_FM1236_MK3 43 #define TUNER_PHILIPS_4IN1 44 /* ATI TV Wonder Pro - Conexant */ -/* Microtune mergeged with Temic 12/31/1999 partially financed by Alps - these may be similar to Temic */ +/* Microtune mergeged with Temic 12/31/1999 partially financed by Alps - these may be similar to Temic */ #define TUNER_MICROTUNE_4049FM5 45 #define TUNER_LG_NTSC_TAPE 47 #define TUNER_TNF_8831BGFF 48 diff --git a/linux/include/media/video-buf.h b/linux/include/media/video-buf.h index 3fd4d7db1..fdf5c71e2 100644 --- a/linux/include/media/video-buf.h +++ b/linux/include/media/video-buf.h @@ -1,5 +1,5 @@ /* - * $Id: video-buf.h,v 1.7 2004/10/11 14:53:13 kraxel Exp $ + * $Id: video-buf.h,v 1.8 2004/10/13 10:39:00 kraxel Exp $ * * generic helper functions for video4linux capture buffers, to handle * memory management and PCI DMA. Right now bttv + saa7134 use it. @@ -9,7 +9,7 @@ * into PAGE_SIZE chunks). They also assume the driver does not need * to touch the video data (thus it is probably not useful for USB as * data often must be uncompressed by the drivers). - * + * * (c) 2001,02 Gerd Knorr <kraxel@bytesex.org> * * This program is free software; you can redistribute it and/or modify @@ -102,7 +102,7 @@ int videobuf_dma_free(struct videobuf_dmabuf *dma); * functions, additionally some commonly used fields for v4l buffers * (width, height, lists, waitqueue) are in there. That struct should * be used as first element in the drivers buffer struct. - * + * * about the mmap helpers (videobuf_mmap_*): * * The mmaper function allows to map any subset of contingous buffers. |