From: <rb...@fr...> - 2005-01-07 10:12:25
|
CVS Root: /cvs/gstreamer Module: gst-plugins Changes by: rbultje Date: Fri Jan 07 2005 02:12:23 PST Log message: * sys/v4l2/gstv4l2src.c: (gst_v4l2src_getcaps): Fix against template (#150576). Modified files: . : ChangeLog sys/v4l2 : gstv4l2src.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/ChangeLog.diff?r1=1.1462&r2=1.1463 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/sys/v4l2/gstv4l2src.c.diff?r1=1.35&r2=1.36 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins/ChangeLog,v retrieving revision 1.1462 retrieving revision 1.1463 diff -u -d -r1.1462 -r1.1463 --- ChangeLog 6 Jan 2005 20:19:04 -0000 1.1462 +++ ChangeLog 7 Jan 2005 10:12:11 -0000 1.1463 @@ -1,3 +1,8 @@ +2005-01-07 Ronald S. Bultje <rb...@ro...> + + * sys/v4l2/gstv4l2src.c: (gst_v4l2src_getcaps): + Fix against template (#150576). 2005-01-06 Benjamin Otte <ot...@gn...> * gst/games/gstpuzzle.c: (draw_puzzle): Index: gstv4l2src.c RCS file: /cvs/gstreamer/gst-plugins/sys/v4l2/gstv4l2src.c,v retrieving revision 1.35 retrieving revision 1.36 diff -u -d -r1.35 -r1.36 --- gstv4l2src.c 25 Oct 2004 08:40:07 -0000 1.35 +++ gstv4l2src.c 7 Jan 2005 10:12:11 -0000 1.36 @@ -787,6 +787,15 @@ &min_w, &max_w, &min_h, &max_h)) { continue; } + /* template */ + if (min_w < 1) + min_w = 1; + if (min_h < 1) + min_h = 1; + if (max_w > 4096) + max_w = 4096; + if (max_h > 4096) + max_h = 4096; /* add to list */ structure = gst_v4l2src_v4l2fourcc_to_caps (format->pixelformat); |