]> git.sesse.net Git - vlc/commitdiff
v4l2: respect line pitch specified by the device driver (fixes #8802)
authorRémi Denis-Courmont <remi@remlab.net>
Sun, 16 Jun 2013 15:43:17 +0000 (18:43 +0300)
committerRémi Denis-Courmont <remi@remlab.net>
Sun, 16 Jun 2013 15:43:17 +0000 (18:43 +0300)
modules/access/v4l2/demux.c

index ec98dc3a74423b19305fa719575af303de12eb85..73af8ce52c408c2aed3e533480b6ee27fb51afb9 100644 (file)
@@ -393,7 +393,11 @@ static int InitVideo (demux_t *demux, int fd, uint32_t caps)
     es_fmt.video.i_rmask = selected->red;
     es_fmt.video.i_gmask = selected->green;
     es_fmt.video.i_bmask = selected->blue;
-    es_fmt.video.i_width = fmt.fmt.pix.width;
+    es_fmt.video.i_visible_width = fmt.fmt.pix.width;
+    if (fmt.fmt.pix.bytesperline != 0 && selected->bpp != 0)
+        es_fmt.video.i_width = fmt.fmt.pix.bytesperline / selected->bpp;
+    else
+        es_fmt.video.i_width = fmt.fmt.pix.width;
     es_fmt.video.i_height = fmt.fmt.pix.height;
     es_fmt.video.i_frame_rate = parm.parm.capture.timeperframe.denominator;
     es_fmt.video.i_frame_rate_base = parm.parm.capture.timeperframe.numerator;