diff options
| -rw-r--r-- | linux/include/linux/videodev2.h | 2 | ||||
| -rw-r--r-- | v4l2-apps/util/v4l2-ctl.cpp | 12 |
2 files changed, 1 insertions, 13 deletions
diff --git a/linux/include/linux/videodev2.h b/linux/include/linux/videodev2.h index f21fc9c3b..a90abcc7e 100644 --- a/linux/include/linux/videodev2.h +++ b/linux/include/linux/videodev2.h @@ -617,7 +617,6 @@ struct v4l2_framebuffer #define V4L2_FBUF_CAP_LOCAL_ALPHA 0x0010 #define V4L2_FBUF_CAP_GLOBAL_ALPHA 0x0020 #define V4L2_FBUF_CAP_LOCAL_INV_ALPHA 0x0040 -#define V4L2_FBUF_CAP_GLOBAL_INV_ALPHA 0x0080 /* Flags for the 'flags' field. */ #define V4L2_FBUF_FLAG_PRIMARY 0x0001 #define V4L2_FBUF_FLAG_OVERLAY 0x0002 @@ -625,7 +624,6 @@ struct v4l2_framebuffer #define V4L2_FBUF_FLAG_LOCAL_ALPHA 0x0008 #define V4L2_FBUF_FLAG_GLOBAL_ALPHA 0x0010 #define V4L2_FBUF_FLAG_LOCAL_INV_ALPHA 0x0020 -#define V4L2_FBUF_FLAG_GLOBAL_INV_ALPHA 0x0040 struct v4l2_clip { diff --git a/v4l2-apps/util/v4l2-ctl.cpp b/v4l2-apps/util/v4l2-ctl.cpp index cc6819971..fda6eec48 100644 --- a/v4l2-apps/util/v4l2-ctl.cpp +++ b/v4l2-apps/util/v4l2-ctl.cpp @@ -318,8 +318,7 @@ static void usage(void) printf(" --get-fmt-vbi query the VBI capture format [VIDIOC_G_FMT]\n"); printf(" --get-fmt-vbi-out query the VBI output format [VIDIOC_G_FMT]\n"); printf(" --get-fbuf query the overlay framebuffer data [VIDIOC_G_FBUF]\n"); - printf(" --set-fbuf=chromakey=<0/1>,global_alpha=<0/1>,local_alpha=<0/1>,\n"); - printf(" global_inv_alpha=<0/1>,local_inv_alpha=<0/1>\n"); + printf(" --set-fbuf=chromakey=<0/1>,global_alpha=<0/1>,local_alpha=<0/1>,local_inv_alpha=<0/1>\n"); printf(" set the overlay framebuffer [VIDIOC_S_FBUF]\n"); printf(" --get-cropcap query the crop capabilities [VIDIOC_CROPCAP]\n"); printf(" --get-crop query the video capture crop window [VIDIOC_G_CROP]\n"); @@ -650,8 +649,6 @@ static std::string fbufcap2s(unsigned cap) s += "\t\t\tGlobal Alpha\n"; if (cap & V4L2_FBUF_CAP_LOCAL_ALPHA) s += "\t\t\tLocal Alpha\n"; - if (cap & V4L2_FBUF_CAP_GLOBAL_INV_ALPHA) - s += "\t\t\tGlobal Inverted Alpha\n"; if (cap & V4L2_FBUF_CAP_LOCAL_INV_ALPHA) s += "\t\t\tLocal Inverted Alpha\n"; if (cap & V4L2_FBUF_CAP_LIST_CLIPPING) @@ -676,8 +673,6 @@ static std::string fbufflags2s(unsigned fl) s += "\t\t\tGlobal Alpha\n"; if (fl & V4L2_FBUF_FLAG_LOCAL_ALPHA) s += "\t\t\tLocal Alpha\n"; - if (fl & V4L2_FBUF_FLAG_GLOBAL_INV_ALPHA) - s += "\t\t\tGlobal Inverted Alpha\n"; if (fl & V4L2_FBUF_FLAG_LOCAL_INV_ALPHA) s += "\t\t\tLocal Inverted Alpha\n"; if (s.empty()) s += "\t\t\t\n"; @@ -1298,7 +1293,6 @@ int main(int argc, char **argv) "chromakey", "global_alpha", "local_alpha", - "global_inv_alpha", "local_inv_alpha", NULL }; @@ -1317,10 +1311,6 @@ int main(int argc, char **argv) set_fbuf |= V4L2_FBUF_FLAG_LOCAL_ALPHA; break; case 3: - fbuf.flags |= strtol(value, 0L, 0) ? V4L2_FBUF_FLAG_GLOBAL_INV_ALPHA : 0; - set_fbuf |= V4L2_FBUF_FLAG_GLOBAL_INV_ALPHA; - break; - case 4: fbuf.flags |= strtol(value, 0L, 0) ? V4L2_FBUF_FLAG_LOCAL_INV_ALPHA : 0; set_fbuf |= V4L2_FBUF_FLAG_LOCAL_INV_ALPHA; break; |