summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-04-09 08:44:34 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2005-04-09 08:44:34 +0000
commitfb0ad55438a75be755bb8ddc7c10526bf74f38d7 (patch)
treec47d9ab897cd7a56777fd572db31d74427b1d2a0
parentba521058368773a88e5ca2a9a3d7c0e5a0672f98 (diff)
downloadgst-plugins-bad-fb0ad55438a75be755bb8ddc7c10526bf74f38d7.tar.gz
gst-plugins-bad-fb0ad55438a75be755bb8ddc7c10526bf74f38d7.tar.bz2
gst-plugins-bad-fb0ad55438a75be755bb8ddc7c10526bf74f38d7.zip
gst/videocrop/gstvideocrop.c: Renegotiate after a set_property, not after a get_property. Fixes #172563.
Original commit message from CVS: * gst/videocrop/gstvideocrop.c: (gst_video_crop_set_property), (gst_video_crop_get_property): Renegotiate after a set_property, not after a get_property. Fixes #172563.
-rw-r--r--ChangeLog7
-rw-r--r--gst/videocrop/gstvideocrop.c6
2 files changed, 10 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 562307a1..e99335a9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2005-04-09 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+ * gst/videocrop/gstvideocrop.c: (gst_video_crop_set_property),
+ (gst_video_crop_get_property):
+ Renegotiate after a set_property, not after a get_property. Fixes
+ #172563.
+
+2005-04-09 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
+
* gst/qtdemux/qtdemux.c: (qtdemux_parse_trak):
NULL-terminate vararg functions properly (#172946).
diff --git a/gst/videocrop/gstvideocrop.c b/gst/videocrop/gstvideocrop.c
index 47a2def8..61f9fd59 100644
--- a/gst/videocrop/gstvideocrop.c
+++ b/gst/videocrop/gstvideocrop.c
@@ -235,6 +235,9 @@ gst_video_crop_set_property (GObject * object, guint prop_id,
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
+
+ if (gst_pad_is_negotiated (video_crop->srcpad))
+ video_crop->renegotiate_src_caps = TRUE;
}
static void
gst_video_crop_get_property (GObject * object, guint prop_id, GValue * value,
@@ -263,9 +266,6 @@ gst_video_crop_get_property (GObject * object, guint prop_id, GValue * value,
G_OBJECT_WARN_INVALID_PROPERTY_ID (object, prop_id, pspec);
break;
}
-
- if (gst_pad_is_negotiated (video_crop->srcpad))
- video_crop->renegotiate_src_caps = TRUE;
}
static void