Fedora kernel-2.6.17-1.2142_FC4 patched with stable patch-2.6.17.4-vs2.0.2-rc26.diff

[linux-2.6.git] / include / media / saa6752hs.h

diff --git a/include/media/saa6752hs.h b/include/media/saa6752hs.h
index 791bad2..3b8686e 100644 (file)
--- a/include/media/saa6752hs.h
+++ b/include/media/saa6752hs.h
@@ -18,55 +18,6 @@
     Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 */
 
-#if 0 /* ndef _SAA6752HS_H */
-#define _SAA6752HS_H
-
-enum mpeg_video_bitrate_mode {
-       MPEG_VIDEO_BITRATE_MODE_VBR = 0, /* Variable bitrate */
-       MPEG_VIDEO_BITRATE_MODE_CBR = 1, /* Constant bitrate */
-
-       MPEG_VIDEO_BITRATE_MODE_MAX
-};
-
-enum mpeg_audio_bitrate {
-       MPEG_AUDIO_BITRATE_256 = 0, /* 256 kBit/sec */
-       MPEG_AUDIO_BITRATE_384 = 1, /* 384 kBit/sec */
-
-       MPEG_AUDIO_BITRATE_MAX
-};
-
-enum mpeg_video_format {
-       MPEG_VIDEO_FORMAT_D1 = 0,
-       MPEG_VIDEO_FORMAT_2_3_D1 = 1,
-       MPEG_VIDEO_FORMAT_1_2_D1 = 2,
-       MPEG_VIDEO_FORMAT_SIF = 3,
-
-       MPEG_VIDEO_FORMAT_MAX
-};
-
-#define MPEG_VIDEO_TARGET_BITRATE_MAX 27000
-#define MPEG_VIDEO_MAX_BITRATE_MAX 27000
-#define MPEG_TOTAL_BITRATE_MAX 27000
-#define MPEG_PID_MAX ((1 << 14) - 1)
-
-struct mpeg_params {
-       enum mpeg_video_bitrate_mode video_bitrate_mode;
-       unsigned int video_target_bitrate;
-       unsigned int video_max_bitrate; // only used for VBR
-       enum mpeg_audio_bitrate audio_bitrate;
-       unsigned int total_bitrate;
-
-       unsigned int pmt_pid;
-       unsigned int video_pid;
-       unsigned int audio_pid;
-       unsigned int pcr_pid;
-
-       enum mpeg_video_format video_format;
-};
-
-#define MPEG_SETPARAMS             _IOW('6',100,struct mpeg_params)
-
-#endif // _SAA6752HS_H
 
 /*
  * Local variables: