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: Rename V4L2_IN/OUT_CAP_CUSTOM_TIMINGS to V4L2_IN/OUT_CAP_DV_TIMINGS
Author:  Hans Verkuil <[email protected]>
Date:    Thu Sep 27 09:17:52 2012 +0200

The _CUSTOM_TIMINGS name is deprecated and will be removed in the future,
so replace it with the new _DV_TIMINGS name in the code.

Signed-off-by: Hans Verkuil <[email protected]>
(cherry picked from commit 21d6fc51cb93e8dcb1f037da28fb56dd7806f4f2)

Signed-off-by: Gregor Jasny <[email protected]>

 utils/v4l2-compliance/v4l2-test-io-config.cpp |   16 ++++++++--------
 1 files changed, 8 insertions(+), 8 deletions(-)

---

http://git.linuxtv.org/v4l-utils.git?a=commitdiff;h=a71ce630c88e13c914818c63fea0d37d25c1580d

diff --git a/utils/v4l2-compliance/v4l2-test-io-config.cpp 
b/utils/v4l2-compliance/v4l2-test-io-config.cpp
index 44610fd..2b0a4d4 100644
--- a/utils/v4l2-compliance/v4l2-test-io-config.cpp
+++ b/utils/v4l2-compliance/v4l2-test-io-config.cpp
@@ -293,9 +293,9 @@ int testCustomTimings(struct node *node)
                ret = doioctl(node, VIDIOC_S_INPUT, &input.index);
                if (ret)
                        return fail("could not select input %d.\n", i);
-               if (input.capabilities & V4L2_IN_CAP_CUSTOM_TIMINGS)
+               if (input.capabilities & V4L2_IN_CAP_DV_TIMINGS)
                        has_timings = true;
-               if (checkTimings(node, input.capabilities & 
V4L2_IN_CAP_CUSTOM_TIMINGS))
+               if (checkTimings(node, input.capabilities & 
V4L2_IN_CAP_DV_TIMINGS))
                        return fail("Timings failed for input %d.\n", i);
        }
 
@@ -309,9 +309,9 @@ int testCustomTimings(struct node *node)
                ret = doioctl(node, VIDIOC_S_OUTPUT, &output.index);
                if (ret)
                        return fail("could not select output %d.\n", o);
-               if (output.capabilities & V4L2_OUT_CAP_CUSTOM_TIMINGS)
+               if (output.capabilities & V4L2_OUT_CAP_DV_TIMINGS)
                        has_timings = true;
-               if (checkTimings(node, output.capabilities & 
V4L2_OUT_CAP_CUSTOM_TIMINGS))
+               if (checkTimings(node, output.capabilities & 
V4L2_OUT_CAP_DV_TIMINGS))
                        return fail("Timings check failed for output %d.\n", o);
        }
        return has_timings ? 0 : ENOTTY;
@@ -357,9 +357,9 @@ int testTimingsCap(struct node *node)
                ret = doioctl(node, VIDIOC_S_INPUT, &input.index);
                if (ret)
                        return fail("could not select input %d.\n", i);
-               if (input.capabilities & V4L2_IN_CAP_CUSTOM_TIMINGS)
+               if (input.capabilities & V4L2_IN_CAP_DV_TIMINGS)
                        has_timings = true;
-               if (checkTimingsCap(node, input.capabilities & 
V4L2_IN_CAP_CUSTOM_TIMINGS))
+               if (checkTimingsCap(node, input.capabilities & 
V4L2_IN_CAP_DV_TIMINGS))
                        return fail("Timings cap failed for input %d.\n", i);
        }
 
@@ -373,9 +373,9 @@ int testTimingsCap(struct node *node)
                ret = doioctl(node, VIDIOC_S_OUTPUT, &output.index);
                if (ret)
                        return fail("could not select output %d.\n", o);
-               if (output.capabilities & V4L2_OUT_CAP_CUSTOM_TIMINGS)
+               if (output.capabilities & V4L2_OUT_CAP_DV_TIMINGS)
                        has_timings = true;
-               if (checkTimingsCap(node, output.capabilities & 
V4L2_OUT_CAP_CUSTOM_TIMINGS))
+               if (checkTimingsCap(node, output.capabilities & 
V4L2_OUT_CAP_DV_TIMINGS))
                        return fail("Timings cap check failed for output 
%d.\n", o);
        }
        return has_timings ? 0 : ENOTTY;

_______________________________________________
linuxtv-commits mailing list
[email protected]
http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits

Reply via email to