diff options
| author | Gerd Knorr <kraxel@bytesex.org> | 2004-11-10 21:43:11 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@ppc970.osdl.org> | 2004-11-10 21:43:11 -0800 |
| commit | eba51e01aa7096f22edf19b6e135c852dac4ec57 (patch) | |
| tree | 2a69782b80eedbfa5304b7e3dd51f05525080d71 /include | |
| parent | c94f751fed512b100ef42edfc9c8661da8f41fc8 (diff) | |
[PATCH] v4l: saa7134 update
This is a update for the saa7134 driver, changes:
* adapt to the video-buf changes.
* add new cards.
* split mpeg encoder card support to separare module
(saa7134-empress), as preparation for the dvb support
which also uses the MPEG capabilities of the card.
* started working on dvb support (not functional yet, also
marked 'BROKEN').
* convert insmod options to new-style.
The patch also removes all trailing whitespaces. I've a script to remove
them from my sources now, that should kill those no-op whitespace changes
in my patches after merging this initial cleanup.
Signed-off-by: Gerd Knorr <kraxel@bytesex.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/media/saa6752hs.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/include/media/saa6752hs.h b/include/media/saa6752hs.h index 8485d2e49a81..135f9a682429 100644 --- a/include/media/saa6752hs.h +++ b/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; |