summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-01-07 10:12:11 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-01-07 10:12:11 +0000
commit1278d44ad5481fa02267ab4c9ee7bba0fa13d4f1 (patch)
treeb011e2c621ddb1f21d896e582683b2b8986ac12c
parent33a8594b55017b9765f50ca44869a17439937412 (diff)
downloadgst-plugins-bad-1278d44ad5481fa02267ab4c9ee7bba0fa13d4f1.tar.gz
gst-plugins-bad-1278d44ad5481fa02267ab4c9ee7bba0fa13d4f1.tar.bz2
gst-plugins-bad-1278d44ad5481fa02267ab4c9ee7bba0fa13d4f1.zip
sys/v4l2/gstv4l2src.c: Fix against template (#150576).
Original commit message from CVS: * sys/v4l2/gstv4l2src.c: (gst_v4l2src_getcaps): Fix against template (#150576).
-rw-r--r--ChangeLog5
-rw-r--r--sys/v4l2/gstv4l2src.c9
2 files changed, 14 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index e824be87..96905e24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-01-07 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+
+ * sys/v4l2/gstv4l2src.c: (gst_v4l2src_getcaps):
+ Fix against template (#150576).
+
2005-01-06 Benjamin Otte <otte@gnome.org>
* gst/games/gstpuzzle.c: (draw_puzzle):
diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c
index af20eebb..45b60bde 100644
--- a/sys/v4l2/gstv4l2src.c
+++ b/sys/v4l2/gstv4l2src.c
@@ -787,6 +787,15 @@ gst_v4l2src_getcaps (GstPad * pad)
&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);