diff options
Diffstat (limited to 'linux/include')
| -rw-r--r-- | linux/include/linux/videodev2.h | 17 |
1 files changed, 7 insertions, 10 deletions
diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index 4cc0cd754..bc3e89deb 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -295,6 +295,8 @@ enum v4l2_mpeg_audiotype { V4L2_MPEG_AU_2_I, /* MPEG-2 layer 1 */ V4L2_MPEG_AU_2_II, /* MPEG-2 layer 2 */ V4L2_MPEG_AU_2_III, /* MPEG-2 layer 3 */ + V4L2_MPEG_AC3, /* AC3 */ + V4L2_MPEG_LPCM, /* LPCM */ }; enum v4l2_mpeg_videotype { V4L2_MPEG_VI_1, /* MPEG-1 */ @@ -302,8 +304,6 @@ enum v4l2_mpeg_videotype { }; struct v4l2_mpeg_compression { - /* FIXME: how to handle profiles? */ - /* general */ enum v4l2_mpeg_streamtype st_type; @@ -315,7 +315,7 @@ struct v4l2_mpeg_compression { /* program stream */ u16 ps_size; - u16 reserved0; /* placed here for alignment */ + u16 reserved1; /* placed here for alignment */ /* audio */ enum v4l2_mpeg_audiotype au_type; @@ -328,15 +328,12 @@ struct v4l2_mpeg_compression { u32 vi_frame_rate; u16 vi_frames_per_gop; u16 vi_bframes_count; - -#if 0 - /* FIXME: found in iviv driver */ - gop_closure // whats this? sounds at least mpeg related? - pulldown // we probably want that one ... -#endif + int closed_gops:1; + int pulldown:1; + int reserved2:30; /* I don't expect the above being perfect yet ;) */ - u32 reserved1[8]; + u32 reserved3[8]; }; #endif |