diff options
| author | Robert Swain <robert.swain@collabora.co.uk> | 2012-07-27 11:31:13 +0200 |
|---|---|---|
| committer | Robert Swain <robert.swain@collabora.co.uk> | 2012-07-27 11:33:12 +0200 |
| commit | af7fee714dbb8d31ac84cc4a9b72bf0371a83474 (patch) | |
| tree | 76f0384b882f80db248ea90cd3ab73e505e90b05 /gst/videocrop | |
| parent | 2e8260a78718eff214c17e563fab43327a7604da (diff) | |
| download | gstreamer-plugins-good-af7fee714dbb8d31ac84cc4a9b72bf0371a83474.tar.gz | |
videocrop: Don't return NULL from _transform_caps
If _transform_caps () returns NULL, the basetransform _transform_caps
tries to call gst_caps_is_subset () with a NULL subset which hits an
assertion.
Diffstat (limited to 'gst/videocrop')
| -rw-r--r-- | gst/videocrop/gstvideocrop.c | 7 |
1 files changed, 1 insertions, 6 deletions
diff --git a/gst/videocrop/gstvideocrop.c b/gst/videocrop/gstvideocrop.c index 77e6d08e1..baca7e88e 100644 --- a/gst/videocrop/gstvideocrop.c +++ b/gst/videocrop/gstvideocrop.c @@ -609,12 +609,7 @@ gst_video_crop_transform_caps (GstBaseTransform * trans, gst_caps_append_structure (other_caps, new_structure); } - if (gst_caps_is_empty (other_caps)) { - gst_caps_unref (other_caps); - other_caps = NULL; - } - - if (other_caps && filter_caps) { + if (!gst_caps_is_empty (other_caps) && filter_caps) { GstCaps *tmp = gst_caps_intersect_full (filter_caps, other_caps, GST_CAPS_INTERSECT_FIRST); gst_caps_replace (&other_caps, tmp); |