diff options
| author | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2006-03-23 23:44:19 -0500 |
| commit | 1ebbe2b20091d306453a5cf480a87e6cd28ae76f (patch) | |
| tree | f5cd7a0fa69b8b1938cb5a0faed2e7b0628072a5 /include/linux/dvb/audio.h | |
| parent | ac58c9059da8886b5e8cde012a80266b18ca146e (diff) | |
| parent | 674a396c6d2ba0341ebdd7c1c9950f32f018e2dd (diff) | |
Merge branch 'linus'
Diffstat (limited to 'include/linux/dvb/audio.h')
| -rw-r--r-- | include/linux/dvb/audio.h | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/include/linux/dvb/audio.h b/include/linux/dvb/audio.h index 2b8797084685..0874a67c6b92 100644 --- a/include/linux/dvb/audio.h +++ b/include/linux/dvb/audio.h | |||
| @@ -121,4 +121,17 @@ typedef uint16_t audio_attributes_t; | |||
| 121 | #define AUDIO_SET_ATTRIBUTES _IOW('o', 17, audio_attributes_t) | 121 | #define AUDIO_SET_ATTRIBUTES _IOW('o', 17, audio_attributes_t) |
| 122 | #define AUDIO_SET_KARAOKE _IOW('o', 18, audio_karaoke_t) | 122 | #define AUDIO_SET_KARAOKE _IOW('o', 18, audio_karaoke_t) |
| 123 | 123 | ||
| 124 | /** | ||
| 125 | * AUDIO_GET_PTS | ||
| 126 | * | ||
| 127 | * Read the 33 bit presentation time stamp as defined | ||
| 128 | * in ITU T-REC-H.222.0 / ISO/IEC 13818-1. | ||
| 129 | * | ||
| 130 | * The PTS should belong to the currently played | ||
| 131 | * frame if possible, but may also be a value close to it | ||
| 132 | * like the PTS of the last decoded frame or the last PTS | ||
| 133 | * extracted by the PES parser. | ||
| 134 | */ | ||
| 135 | #define AUDIO_GET_PTS _IOR('o', 19, __u64) | ||
| 136 | |||
| 124 | #endif /* _DVBAUDIO_H_ */ | 137 | #endif /* _DVBAUDIO_H_ */ |
