[MPlayer-cvslog] CVS: main/libmpdemux tvi_v4l2.c,1.27,1.28

Sascha Sommer CVS syncmail at mplayerhq.hu
Sat Aug 6 21:45:57 CEST 2005


CVS change done by Sascha Sommer CVS

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var2/tmp/cvs-serv2746/libmpdemux

Modified Files:
	tvi_v4l2.c 
Log Message:
take into account that VIDIOC_S_FMT might return updated parameters

Index: tvi_v4l2.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/tvi_v4l2.c,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -r1.27 -r1.28
--- tvi_v4l2.c	6 Aug 2005 18:19:58 -0000	1.27
+++ tvi_v4l2.c	6 Aug 2005 19:45:55 -0000	1.28
@@ -590,6 +590,9 @@
 		   info.short_name, strerror(errno));
 	    return TVI_CONTROL_FALSE;
 	}
+	/* according to the v4l2 specs VIDIOC_S_FMT should not fail, inflexible drivers
+	  might even always return the default parameters -> update the format here*/
+	priv->mp_format = fcc_vl2mp(priv->format.fmt.pix.pixelformat);
 	return TVI_CONTROL_TRUE;
     case TVI_CONTROL_VID_GET_WIDTH:
 	if (getfmt(priv) < 0) return TVI_CONTROL_FALSE;




More information about the MPlayer-cvslog mailing list