diff options
| author | Steve French <sfrench@us.ibm.com> | 2006-01-12 17:47:08 -0500 |
|---|---|---|
| committer | Steve French <sfrench@us.ibm.com> | 2006-01-12 17:47:08 -0500 |
| commit | 94bc2be31a01a3055ec94176e595dfe208e92d3b (patch) | |
| tree | ebfbe81c6718a6390bfa1b99c6d228237d818576 /include/linux/video_decoder.h | |
| parent | c32a0b689cb9cc160cfcd19735bbf50bb70c6ef4 (diff) | |
| parent | 58cba4650a7a414eabd2b40cc9d8e45fcdf192d9 (diff) | |
Merge with /pub/scm/linux/kernel/git/torvalds/linux-2.6.git
Signed-off-by: Steve French <sfrench@us.ibm.com>
Diffstat (limited to 'include/linux/video_decoder.h')
| -rw-r--r-- | include/linux/video_decoder.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/video_decoder.h b/include/linux/video_decoder.h index 0e9e48b83e3b..121e26da2c18 100644 --- a/include/linux/video_decoder.h +++ b/include/linux/video_decoder.h | |||
| @@ -1,6 +1,8 @@ | |||
| 1 | #ifndef _LINUX_VIDEO_DECODER_H | 1 | #ifndef _LINUX_VIDEO_DECODER_H |
| 2 | #define _LINUX_VIDEO_DECODER_H | 2 | #define _LINUX_VIDEO_DECODER_H |
| 3 | 3 | ||
| 4 | #define HAVE_VIDEO_DECODER 1 | ||
| 5 | |||
| 4 | struct video_decoder_capability { /* this name is too long */ | 6 | struct video_decoder_capability { /* this name is too long */ |
| 5 | __u32 flags; | 7 | __u32 flags; |
| 6 | #define VIDEO_DECODER_PAL 1 /* can decode PAL signal */ | 8 | #define VIDEO_DECODER_PAL 1 /* can decode PAL signal */ |