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.
This commit is contained in:
Robert Swain 2012-07-27 11:31:13 +02:00
parent 2e8260a787
commit af7fee714d

View file

@ -609,12 +609,7 @@ gst_video_crop_transform_caps (GstBaseTransform * trans,
gst_caps_append_structure (other_caps, new_structure); gst_caps_append_structure (other_caps, new_structure);
} }
if (gst_caps_is_empty (other_caps)) { if (!gst_caps_is_empty (other_caps) && filter_caps) {
gst_caps_unref (other_caps);
other_caps = NULL;
}
if (other_caps && filter_caps) {
GstCaps *tmp = gst_caps_intersect_full (filter_caps, other_caps, GstCaps *tmp = gst_caps_intersect_full (filter_caps, other_caps,
GST_CAPS_INTERSECT_FIRST); GST_CAPS_INTERSECT_FIRST);
gst_caps_replace (&other_caps, tmp); gst_caps_replace (&other_caps, tmp);