fix for _do_simplify changes

This commit is contained in:
Wim Taymans 2012-03-12 10:43:57 +01:00
parent a32d944a38
commit 80dca40c35
3 changed files with 6 additions and 6 deletions

View file

@ -139,9 +139,9 @@ gst_alpha_color_transform_caps (GstBaseTransform * btrans,
/* Intersect with our template caps */ /* Intersect with our template caps */
result = gst_caps_intersect (local_caps, tmpl_caps); result = gst_caps_intersect (local_caps, tmpl_caps);
gst_caps_unref (tmpl_caps); gst_caps_unref (tmpl_caps);
gst_caps_unref (local_caps); gst_caps_unref (local_caps);
gst_caps_do_simplify (result);
result = gst_caps_do_simplify (result);
GST_LOG_OBJECT (btrans, "transformed %" GST_PTR_FORMAT " to %" GST_PTR_FORMAT, GST_LOG_OBJECT (btrans, "transformed %" GST_PTR_FORMAT " to %" GST_PTR_FORMAT,
caps, result); caps, result);

View file

@ -5074,7 +5074,7 @@ gst_matroska_demux_video_caps (GstMatroskaTrackVideoContext *
gst_structure_set (structure, "interlaced", G_TYPE_BOOLEAN, TRUE, NULL); gst_structure_set (structure, "interlaced", G_TYPE_BOOLEAN, TRUE, NULL);
} }
gst_caps_do_simplify (caps); caps = gst_caps_do_simplify (caps);
} }
return caps; return caps;
@ -5443,7 +5443,7 @@ gst_matroska_demux_audio_caps (GstMatroskaTrackAudioContext *
} }
} }
gst_caps_do_simplify (caps); caps = gst_caps_do_simplify (caps);
} }
return caps; return caps;

View file

@ -458,7 +458,7 @@ gst_oss4_audio_probe_caps (GstObject * obj, int fd)
} }
} }
gst_caps_do_simplify (caps); caps = gst_caps_do_simplify (caps);
GST_LOG_OBJECT (obj, "formats: %" GST_PTR_FORMAT, caps); GST_LOG_OBJECT (obj, "formats: %" GST_PTR_FORMAT, caps);
if (!gst_oss4_audio_detect_rates (obj, &ai, caps)) if (!gst_oss4_audio_detect_rates (obj, &ai, caps))
@ -505,7 +505,7 @@ gst_oss4_audio_get_template_caps (void)
gst_oss4_append_format_to_caps (&fmt_map[i], caps); gst_oss4_append_format_to_caps (&fmt_map[i], caps);
} }
gst_caps_do_simplify (caps); caps = gst_caps_do_simplify (caps);
for (i = 0; i < gst_caps_get_size (caps); ++i) { for (i = 0; i < gst_caps_get_size (caps); ++i) {
GstStructure *s; GstStructure *s;