diff options
| author | Gerd Knorr <devnull@localhost> | 2004-11-18 14:05:57 +0000 |
|---|---|---|
| committer | Gerd Knorr <devnull@localhost> | 2004-11-18 14:05:57 +0000 |
| commit | 321a15f38d481d059222946e6d2c9ba40fa17c74 (patch) | |
| tree | ec1db32c4b8ee83c12113b344fd0657a3d03ec25 /linux/include | |
| parent | 934ba7334a01a4630df777e0c9f9f6b97637fde9 (diff) | |
| download | mediapointer-dvb-s2-321a15f38d481d059222946e6d2c9ba40fa17c74.tar.gz mediapointer-dvb-s2-321a15f38d481d059222946e6d2c9ba40fa17c74.tar.bz2 | |
- a batch of mpeg2/empress fixes/changes.
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/linux/videodev2.h | 43 |
1 files changed, 22 insertions, 21 deletions
diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index f75722fd3..f3cac6fc3 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -281,10 +281,11 @@ enum v4l2_bitrate_mode { V4L2_BITRATE_VBR, /* variable bitrate */ }; struct v4l2_bitrate { + /* rates are specified in kbit/sec */ enum v4l2_bitrate_mode mode; - u32 min; - u32 target; - u32 max; + __u32 min; + __u32 target; /* use this one for CBR */ + __u32 max; }; enum v4l2_mpeg_streamtype { @@ -311,38 +312,38 @@ struct v4l2_mpeg_compression { struct v4l2_bitrate st_bitrate; /* transport streams */ - u16 ts_pid_pmt; - u16 ts_pid_audio; - u16 ts_pid_video; - u16 ts_pid_pcr; + __u16 ts_pid_pmt; + __u16 ts_pid_audio; + __u16 ts_pid_video; + __u16 ts_pid_pcr; /* program stream */ - u16 ps_size; - u16 reserved_1; /* align */ + __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 */ + __u32 au_sample_rate; + __u8 au_pesid; + __u8 reserved_2[3]; /* align */ /* video */ enum v4l2_mpeg_videotype vi_type; struct v4l2_bitrate vi_bitrate; - u32 vi_frame_rate; - u16 vi_frames_per_gop; - u16 vi_bframes_count; - u8 vi_pesid; - u8 reserved_3[3]; /* align */ + __u32 vi_frame_rate; + __u16 vi_frames_per_gop; + __u16 vi_bframes_count; + __u8 vi_pesid; + __u8 reserved_3[3]; /* align */ /* misc flags */ - u32 closed_gops:1; - u32 pulldown:1; - u32 reserved_4:30; /* align */ + __u32 closed_gops:1; + __u32 pulldown:1; + __u32 reserved_4:30; /* align */ /* I don't expect the above being perfect yet ;) */ - u32 reserved_5[8]; + __u32 reserved_5[8]; }; #endif |