mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-01-25 16:48:11 +00:00
gst/elements/gstcapsfilter.c: Allow NULL as filter-caps (which means "any").
Original commit message from CVS: * gst/elements/gstcapsfilter.c: (gst_capsfilter_set_property): Allow NULL as filter-caps (which means "any").
This commit is contained in:
parent
4e2d045ed2
commit
c80125e55b
4 changed files with 16 additions and 5 deletions
|
@ -1,3 +1,8 @@
|
||||||
|
2005-08-07 Ronald S. Bultje <rbultje@ronald.bitfreak.net>
|
||||||
|
|
||||||
|
* gst/elements/gstcapsfilter.c: (gst_capsfilter_set_property):
|
||||||
|
Allow NULL as filter-caps (which means "any").
|
||||||
|
|
||||||
2005-08-05 Stefan Kost <ensonic@users.sf.net>
|
2005-08-05 Stefan Kost <ensonic@users.sf.net>
|
||||||
|
|
||||||
* docs/libs/gstreamer-libs-sections.txt:
|
* docs/libs/gstreamer-libs-sections.txt:
|
||||||
|
|
2
common
2
common
|
@ -1 +1 @@
|
||||||
Subproject commit c99f9050f296219783c6717efe319dc741d2e2d3
|
Subproject commit 856fbbfa88621ab67df141ead8d4d3df32c5c176
|
|
@ -152,11 +152,14 @@ gst_capsfilter_set_property (GObject * object, guint prop_id,
|
||||||
|
|
||||||
switch (prop_id) {
|
switch (prop_id) {
|
||||||
case PROP_FILTER_CAPS:{
|
case PROP_FILTER_CAPS:{
|
||||||
GstCaps *new_caps = gst_caps_copy (gst_value_get_caps (value));
|
const GstCaps *new_caps_val = gst_value_get_caps (value);
|
||||||
|
GstCaps *new_caps;
|
||||||
GstCaps *old_caps;
|
GstCaps *old_caps;
|
||||||
|
|
||||||
if (new_caps == NULL) {
|
if (new_caps_val == NULL) {
|
||||||
new_caps = gst_caps_new_any ();
|
new_caps = gst_caps_new_any ();
|
||||||
|
} else {
|
||||||
|
new_caps = gst_caps_copy (new_caps_val);
|
||||||
}
|
}
|
||||||
|
|
||||||
old_caps = capsfilter->filter_caps;
|
old_caps = capsfilter->filter_caps;
|
||||||
|
|
|
@ -152,11 +152,14 @@ gst_capsfilter_set_property (GObject * object, guint prop_id,
|
||||||
|
|
||||||
switch (prop_id) {
|
switch (prop_id) {
|
||||||
case PROP_FILTER_CAPS:{
|
case PROP_FILTER_CAPS:{
|
||||||
GstCaps *new_caps = gst_caps_copy (gst_value_get_caps (value));
|
const GstCaps *new_caps_val = gst_value_get_caps (value);
|
||||||
|
GstCaps *new_caps;
|
||||||
GstCaps *old_caps;
|
GstCaps *old_caps;
|
||||||
|
|
||||||
if (new_caps == NULL) {
|
if (new_caps_val == NULL) {
|
||||||
new_caps = gst_caps_new_any ();
|
new_caps = gst_caps_new_any ();
|
||||||
|
} else {
|
||||||
|
new_caps = gst_caps_copy (new_caps_val);
|
||||||
}
|
}
|
||||||
|
|
||||||
old_caps = capsfilter->filter_caps;
|
old_caps = capsfilter->filter_caps;
|
||||||
|
|
Loading…
Reference in a new issue