diff options
| author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-07 02:06:48 +0300 |
|---|---|---|
| committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2009-07-07 02:07:11 +0300 |
| commit | 6d908205fbadbdf7ccdc6c5e0eb918f0b43f16e0 (patch) | |
| tree | 09a6acada909bd5d070ace54209cadeae66d15cf /vidix | |
| parent | e306174952d42e1cd6cc5efc50ae6bb0410501bc (diff) | |
| parent | eafe5b7517bbf408ae1ffc936a3abe2313c3b334 (diff) | |
| download | mpv-6d908205fbadbdf7ccdc6c5e0eb918f0b43f16e0.tar.bz2 mpv-6d908205fbadbdf7ccdc6c5e0eb918f0b43f16e0.tar.xz | |
Merge svn changes up to r29304
Diffstat (limited to 'vidix')
| -rw-r--r-- | vidix/vidix.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/vidix/vidix.h b/vidix/vidix.h index 0a00d89412..0f402a3cb7 100644 --- a/vidix/vidix.h +++ b/vidix/vidix.h @@ -38,7 +38,7 @@ #define PROBE_NORMAL 0 /* normal probing */ #define PROBE_FORCE 1 /* ignore device_id but recognize device if it's known */ - + typedef enum vidix_dev_type { TYPE_OUTPUT = 0x00000000, /* Is a video playback device */ TYPE_CAPTURE = 0x00000001, /* Is a capture device */ @@ -58,7 +58,7 @@ typedef enum vidix_dev_flag { FLAG_SUBPIC = 0x00001000, /* Card supports DVD subpictures */ FLAG_EQUALIZER = 0x00002000, /* Card supports equalizer */ } vidix_dev_flag_t; - + typedef struct vidix_capability_s { char name[64]; /* Driver name */ |