mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-02-23 22:46:24 +00:00
fix for caps _normalize changes
This commit is contained in:
parent
c65625be9e
commit
3270eadf8d
1 changed files with 5 additions and 4 deletions
|
@ -279,7 +279,7 @@ update_tags (GstSidDec * siddec)
|
||||||
static gboolean
|
static gboolean
|
||||||
siddec_negotiate (GstSidDec * siddec)
|
siddec_negotiate (GstSidDec * siddec)
|
||||||
{
|
{
|
||||||
GstCaps *allowed, *tmp;
|
GstCaps *allowed;
|
||||||
GstStructure *structure;
|
GstStructure *structure;
|
||||||
int rate = 44100;
|
int rate = 44100;
|
||||||
int channels = 1;
|
int channels = 1;
|
||||||
|
@ -293,9 +293,7 @@ siddec_negotiate (GstSidDec * siddec)
|
||||||
|
|
||||||
GST_DEBUG_OBJECT (siddec, "allowed caps: %" GST_PTR_FORMAT, allowed);
|
GST_DEBUG_OBJECT (siddec, "allowed caps: %" GST_PTR_FORMAT, allowed);
|
||||||
|
|
||||||
tmp = gst_caps_normalize (allowed);
|
allowed = gst_caps_normalize (allowed);
|
||||||
gst_caps_unref (allowed);
|
|
||||||
allowed = tmp;
|
|
||||||
|
|
||||||
structure = gst_caps_get_structure (allowed, 0);
|
structure = gst_caps_get_structure (allowed, 0);
|
||||||
|
|
||||||
|
@ -338,6 +336,8 @@ siddec_negotiate (GstSidDec * siddec)
|
||||||
gst_pad_set_caps (siddec->srcpad, caps);
|
gst_pad_set_caps (siddec->srcpad, caps);
|
||||||
gst_caps_unref (caps);
|
gst_caps_unref (caps);
|
||||||
|
|
||||||
|
gst_caps_unref (allowed);
|
||||||
|
|
||||||
siddec->engine->setConfig (*siddec->config);
|
siddec->engine->setConfig (*siddec->config);
|
||||||
|
|
||||||
return TRUE;
|
return TRUE;
|
||||||
|
@ -351,6 +351,7 @@ nothing_allowed:
|
||||||
invalid_format:
|
invalid_format:
|
||||||
{
|
{
|
||||||
GST_DEBUG_OBJECT (siddec, "invalid audio caps");
|
GST_DEBUG_OBJECT (siddec, "invalid audio caps");
|
||||||
|
gst_caps_unref (allowed);
|
||||||
return FALSE;
|
return FALSE;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue