diff options
author | Hans Verkuil <hans.verkuil@cisco.com> | 2012-09-03 09:38:41 -0400 |
---|---|---|
committer | Mauro Carvalho Chehab <mchehab@redhat.com> | 2012-09-26 08:49:37 -0400 |
commit | 1c4f3c987f44a6653ac49f93d8cbd3adb539be10 (patch) | |
tree | 0e5579dfed92068bf07b7882e1fa026e4fb2ac55 /include/linux | |
parent | a5338190efc7cfa8c99a6856342a77d21c9a05cf (diff) |
[media] Rename V4L2_(IN|OUT)_CAP_CUSTOM_TIMINGS
The 'custom' timings are no longer just for custom timings, but also for standard
CEA/VESA timings. So rename to V4L2_IN/OUT_CAP_DV_TIMINGS.
The old define is still kept for backwards compatibility.
This decision was taken during the 2012 Media Workshop.
Signed-off-by: Hans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'include/linux')
-rw-r--r-- | include/linux/videodev2.h | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/include/linux/videodev2.h b/include/linux/videodev2.h index 1ed8f904567d..61395ef85a00 100644 --- a/include/linux/videodev2.h +++ b/include/linux/videodev2.h | |||
@@ -1191,7 +1191,8 @@ struct v4l2_input { | |||
1191 | 1191 | ||
1192 | /* capabilities flags */ | 1192 | /* capabilities flags */ |
1193 | #define V4L2_IN_CAP_PRESETS 0x00000001 /* Supports S_DV_PRESET */ | 1193 | #define V4L2_IN_CAP_PRESETS 0x00000001 /* Supports S_DV_PRESET */ |
1194 | #define V4L2_IN_CAP_CUSTOM_TIMINGS 0x00000002 /* Supports S_DV_TIMINGS */ | 1194 | #define V4L2_IN_CAP_DV_TIMINGS 0x00000002 /* Supports S_DV_TIMINGS */ |
1195 | #define V4L2_IN_CAP_CUSTOM_TIMINGS V4L2_IN_CAP_DV_TIMINGS /* For compatibility */ | ||
1195 | #define V4L2_IN_CAP_STD 0x00000004 /* Supports S_STD */ | 1196 | #define V4L2_IN_CAP_STD 0x00000004 /* Supports S_STD */ |
1196 | 1197 | ||
1197 | /* | 1198 | /* |
@@ -1214,7 +1215,8 @@ struct v4l2_output { | |||
1214 | 1215 | ||
1215 | /* capabilities flags */ | 1216 | /* capabilities flags */ |
1216 | #define V4L2_OUT_CAP_PRESETS 0x00000001 /* Supports S_DV_PRESET */ | 1217 | #define V4L2_OUT_CAP_PRESETS 0x00000001 /* Supports S_DV_PRESET */ |
1217 | #define V4L2_OUT_CAP_CUSTOM_TIMINGS 0x00000002 /* Supports S_DV_TIMINGS */ | 1218 | #define V4L2_OUT_CAP_DV_TIMINGS 0x00000002 /* Supports S_DV_TIMINGS */ |
1219 | #define V4L2_OUT_CAP_CUSTOM_TIMINGS V4L2_OUT_CAP_DV_TIMINGS /* For compatibility */ | ||
1218 | #define V4L2_OUT_CAP_STD 0x00000004 /* Supports S_STD */ | 1220 | #define V4L2_OUT_CAP_STD 0x00000004 /* Supports S_STD */ |
1219 | 1221 | ||
1220 | /* | 1222 | /* |