summaryrefslogtreecommitdiffstats
path: root/src/plugins/multimedia/ffmpeg/qv4l2camera.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'src/plugins/multimedia/ffmpeg/qv4l2camera.cpp')
-rw-r--r--src/plugins/multimedia/ffmpeg/qv4l2camera.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/plugins/multimedia/ffmpeg/qv4l2camera.cpp b/src/plugins/multimedia/ffmpeg/qv4l2camera.cpp
index e00641419..17516bad6 100644
--- a/src/plugins/multimedia/ffmpeg/qv4l2camera.cpp
+++ b/src/plugins/multimedia/ffmpeg/qv4l2camera.cpp
@@ -146,6 +146,7 @@ void QV4L2CameraDevices::doCheckCameras()
frameSize.pixel_format = formatDesc.pixelformat;
while (!ioctl(fd, VIDIOC_ENUM_FRAMESIZES, &frameSize)) {
+ ++frameSize.index;
if (frameSize.type != V4L2_FRMSIZE_TYPE_DISCRETE)
continue;
@@ -159,9 +160,9 @@ void QV4L2CameraDevices::doCheckCameras()
frameInterval.height = frameSize.discrete.height;
while (!ioctl(fd, VIDIOC_ENUM_FRAMEINTERVALS, &frameInterval)) {
+ ++frameInterval.index;
if (frameInterval.type != V4L2_FRMIVAL_TYPE_DISCRETE)
continue;
- ++frameInterval.index;
float rate = float(frameInterval.discrete.denominator)/float(frameInterval.discrete.numerator);
if (rate > max)
max = rate;
@@ -170,7 +171,6 @@ void QV4L2CameraDevices::doCheckCameras()
}
// qDebug() << " " << resolution << min << max;
- ++frameSize.index;
if (min <= max) {
QCameraFormatPrivate *fmt = new QCameraFormatPrivate;