summaryrefslogtreecommitdiff
path: root/linux/include/media
diff options
context:
space:
mode:
authorBrandon Philips <brandon@ifup.org>2007-11-06 15:02:36 -0800
committerBrandon Philips <brandon@ifup.org>2007-11-06 15:02:36 -0800
commit512f46cb92dd3faf12d28460bb03574ad6a867ab (patch)
tree919f248947af1dbfd1dd9522536b9b1f8c97d484 /linux/include/media
parent8d929dd40fc6ccd651aea85683f84d2c32600da9 (diff)
downloadmediapointer-dvb-s2-512f46cb92dd3faf12d28460bb03574ad6a867ab.tar.gz
mediapointer-dvb-s2-512f46cb92dd3faf12d28460bb03574ad6a867ab.tar.bz2
V4L: videobuf: don't chew up namespace STATE_.*, convert to VIDEOBUF_
s/STATE_NEEDS_INIT/VIDEOBUF_NEEDS_INIT/g s/STATE_PREPARED/VIDEOBUF_PREPARED/g s/STATE_QUEUED/VIDEOBUF_QUEUED/g s/STATE_ACTIVE/VIDEOBUF_ACTIVE/g s/STATE_DONE/VIDEOBUF_DONE/g s/STATE_ERROR/VIDEOBUF_ERROR/g s/STATE_IDLE/VIDEOBUF_IDLE/g Signed-off-by: Brandon Philips <bphilips@suse.de>
Diffstat (limited to 'linux/include/media')
-rw-r--r--linux/include/media/videobuf-core.h14
1 files changed, 7 insertions, 7 deletions
diff --git a/linux/include/media/videobuf-core.h b/linux/include/media/videobuf-core.h
index 4359823c3..32ea6e8fb 100644
--- a/linux/include/media/videobuf-core.h
+++ b/linux/include/media/videobuf-core.h
@@ -56,13 +56,13 @@ struct videobuf_mapping {
};
enum videobuf_state {
- STATE_NEEDS_INIT = 0,
- STATE_PREPARED = 1,
- STATE_QUEUED = 2,
- STATE_ACTIVE = 3,
- STATE_DONE = 4,
- STATE_ERROR = 5,
- STATE_IDLE = 6,
+ VIDEOBUF_NEEDS_INIT = 0,
+ VIDEOBUF_PREPARED = 1,
+ VIDEOBUF_QUEUED = 2,
+ VIDEOBUF_ACTIVE = 3,
+ VIDEOBUF_DONE = 4,
+ VIDEOBUF_ERROR = 5,
+ VIDEOBUF_IDLE = 6,
};
struct videobuf_buffer {