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/qv4l2/general-tab.cpp | 10 +++++----- 1 files changed, 5 insertions(+), 5 deletions(-) --- http://git.linuxtv.org/v4l-utils.git?a=commitdiff;h=6adb3bd83da5adf393f0ce94bc4065b45a3e6d62 diff --git a/utils/qv4l2/general-tab.cpp b/utils/qv4l2/general-tab.cpp index 5885bc0..59afa19 100644 --- a/utils/qv4l2/general-tab.cpp +++ b/utils/qv4l2/general-tab.cpp @@ -94,7 +94,7 @@ GeneralTab::GeneralTab(const QString &device, v4l2 &fd, int n, QWidget *parent) needsStd = true; if (vin.capabilities & V4L2_IN_CAP_PRESETS) needsPreset = true; - if (vin.capabilities & V4L2_IN_CAP_CUSTOM_TIMINGS) + if (vin.capabilities & V4L2_IN_CAP_DV_TIMINGS) needsTimings = true; } while (enum_input(vin)); addWidget(m_videoInput); @@ -644,8 +644,8 @@ void GeneralTab::updateVideoInput() if (m_videoTimings) { refreshTimings(); updateTimings(); - m_videoTimings->setEnabled(in.capabilities & V4L2_IN_CAP_CUSTOM_TIMINGS); - m_qryTimings->setEnabled(in.capabilities & V4L2_IN_CAP_CUSTOM_TIMINGS); + m_videoTimings->setEnabled(in.capabilities & V4L2_IN_CAP_DV_TIMINGS); + m_qryTimings->setEnabled(in.capabilities & V4L2_IN_CAP_DV_TIMINGS); } } @@ -667,8 +667,8 @@ void GeneralTab::updateVideoOutput() m_qryPreset->setEnabled(out.capabilities & V4L2_OUT_CAP_PRESETS); } if (m_videoTimings) { - m_videoTimings->setEnabled(out.capabilities & V4L2_OUT_CAP_CUSTOM_TIMINGS); - m_qryTimings->setEnabled(out.capabilities & V4L2_OUT_CAP_CUSTOM_TIMINGS); + m_videoTimings->setEnabled(out.capabilities & V4L2_OUT_CAP_DV_TIMINGS); + m_qryTimings->setEnabled(out.capabilities & V4L2_OUT_CAP_DV_TIMINGS); } } _______________________________________________ linuxtv-commits mailing list [email protected] http://www.linuxtv.org/cgi-bin/mailman/listinfo/linuxtv-commits
