This is an automatic generated email to let you know that the following patch were queued at the http://git.linuxtv.org/v4l-utils.git tree:
Subject: v4l2-ctl: print format after a TRY_FMT ioctl. Author: Hans Verkuil <[email protected]> Date: Tue Sep 18 15:44:28 2012 +0200 The only reason to use a try_fmt ioctl is to see what format will be chosen, so always print the format in this case instead of only when the verbose flag is set. Signed-off-by: Hans Verkuil <[email protected]> (cherry picked from commit ec682c59ec1477d17c7fef63936e9f220e787058) Signed-off-by: Gregor Jasny <[email protected]> utils/v4l2-ctl/v4l2-ctl-overlay.cpp | 4 ++-- utils/v4l2-ctl/v4l2-ctl-vbi.cpp | 4 ++-- utils/v4l2-ctl/v4l2-ctl-vidcap.cpp | 4 ++-- utils/v4l2-ctl/v4l2-ctl-vidout.cpp | 4 ++-- 4 files changed, 8 insertions(+), 8 deletions(-) --- http://git.linuxtv.org/v4l-utils.git?a=commitdiff;h=c111481f7ed3bceade448580d61733b3aea808fa diff --git a/utils/v4l2-ctl/v4l2-ctl-overlay.cpp b/utils/v4l2-ctl/v4l2-ctl-overlay.cpp index 7c87677..03980ed 100644 --- a/utils/v4l2-ctl/v4l2-ctl-overlay.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-overlay.cpp @@ -269,7 +269,7 @@ void overlay_set(int fd) ret = doioctl(fd, VIDIOC_S_FMT, &fmt); else ret = doioctl(fd, VIDIOC_TRY_FMT, &fmt); - if (ret == 0 && verbose) + if (ret == 0 && (verbose || options[OptTryOverlayFormat])) printfmt(fmt); } } @@ -297,7 +297,7 @@ void overlay_set(int fd) ret = doioctl(fd, VIDIOC_S_FMT, &fmt); else ret = doioctl(fd, VIDIOC_TRY_FMT, &fmt); - if (ret == 0 && verbose) + if (ret == 0 && (verbose || options[OptTryOutputOverlayFormat])) printfmt(fmt); } } diff --git a/utils/v4l2-ctl/v4l2-ctl-vbi.cpp b/utils/v4l2-ctl/v4l2-ctl-vbi.cpp index 005bb6b..ba01b29 100644 --- a/utils/v4l2-ctl/v4l2-ctl-vbi.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-vbi.cpp @@ -136,7 +136,7 @@ void vbi_set(int fd) ret = doioctl(fd, VIDIOC_S_FMT, &vbi_fmt); else ret = doioctl(fd, VIDIOC_TRY_FMT, &vbi_fmt); - if (ret == 0 && verbose) + if (ret == 0 && (verbose || options[OptTrySlicedVbiFormat])) printfmt(vbi_fmt); } @@ -146,7 +146,7 @@ void vbi_set(int fd) ret = doioctl(fd, VIDIOC_S_FMT, &vbi_fmt_out); else ret = doioctl(fd, VIDIOC_TRY_FMT, &vbi_fmt_out); - if (ret == 0 && verbose) + if (ret == 0 && (verbose || options[OptTrySlicedVbiOutFormat])) printfmt(vbi_fmt_out); } } diff --git a/utils/v4l2-ctl/v4l2-ctl-vidcap.cpp b/utils/v4l2-ctl/v4l2-ctl-vidcap.cpp index b6f2606..0182866 100644 --- a/utils/v4l2-ctl/v4l2-ctl-vidcap.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-vidcap.cpp @@ -265,7 +265,7 @@ void vidcap_set(int fd) ret = doioctl(fd, VIDIOC_S_FMT, &in_vfmt); else ret = doioctl(fd, VIDIOC_TRY_FMT, &in_vfmt); - if (ret == 0 && verbose) + if (ret == 0 && (verbose || options[OptTryVideoFormat])) printfmt(in_vfmt); } } @@ -291,7 +291,7 @@ void vidcap_set(int fd) ret = doioctl(fd, VIDIOC_S_FMT, &in_vfmt); else ret = doioctl(fd, VIDIOC_TRY_FMT, &in_vfmt); - if (ret == 0 && verbose) + if (ret == 0 && (verbose || options[OptTryVideoMplaneFormat])) printfmt(in_vfmt); } } diff --git a/utils/v4l2-ctl/v4l2-ctl-vidout.cpp b/utils/v4l2-ctl/v4l2-ctl-vidout.cpp index c583c1e..a0bbd4a 100644 --- a/utils/v4l2-ctl/v4l2-ctl-vidout.cpp +++ b/utils/v4l2-ctl/v4l2-ctl-vidout.cpp @@ -106,7 +106,7 @@ void vidout_set(int fd) ret = doioctl(fd, VIDIOC_S_FMT, &in_vfmt); else ret = doioctl(fd, VIDIOC_TRY_FMT, &in_vfmt); - if (ret == 0 && verbose) + if (ret == 0 && (verbose || options[OptTryVideoOutFormat])) printfmt(in_vfmt); } } @@ -132,7 +132,7 @@ void vidout_set(int fd) ret = doioctl(fd, VIDIOC_S_FMT, &in_vfmt); else ret = doioctl(fd, VIDIOC_TRY_FMT, &in_vfmt); - if (ret == 0 && verbose) + if (ret == 0 && (verbose || options[OptTryVideoOutMplaneFormat])) printfmt(in_vfmt); } } _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
