diff options
| author | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-08-03 18:42:33 -0300 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2007-08-03 18:42:33 -0300 |
| commit | 2c888a66d88e5aefc1bdb302c7cd7323b63e389f (patch) | |
| tree | 75348f946cc95400e870fbd29d38d6311fe32359 /v4l2-apps/util/v4l2-ctl.cpp | |
| parent | 33c78c13eddb4c4a04755bd86526fc21536a3c8b (diff) | |
| parent | 4ff0e90195667bad0ed6a181d045fb8d71f7d053 (diff) | |
| download | mediapointer-dvb-s2-2c888a66d88e5aefc1bdb302c7cd7323b63e389f.tar.gz mediapointer-dvb-s2-2c888a66d88e5aefc1bdb302c7cd7323b63e389f.tar.bz2 | |
merge: http://linuxtv.org/hg/~tap/v4l-dvb
From: Mauro Carvalho Chehab <mchehab@infradead.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>
Diffstat (limited to 'v4l2-apps/util/v4l2-ctl.cpp')
| -rw-r--r-- | v4l2-apps/util/v4l2-ctl.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
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; |