diff options
| author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-03-11 19:06:59 +0100 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-03-11 19:06:59 +0100 |
| commit | 77299ba6aeb30a80b4ce9fc1fffd5e1c98c0842a (patch) | |
| tree | 260b936d9a08939e0ac39165ffeb328cb6791fe5 /gst/autoconvert | |
| parent | 857a9564f1992829655d4648898e069889f51844 (diff) | |
| download | gstreamer-plugins-bad-77299ba6aeb30a80b4ce9fc1fffd5e1c98c0842a.tar.gz | |
fix for caps api changes
Diffstat (limited to 'gst/autoconvert')
| -rw-r--r-- | gst/autoconvert/gstautoconvert.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gst/autoconvert/gstautoconvert.c b/gst/autoconvert/gstautoconvert.c index 32bab0446..1ecc35499 100644 --- a/gst/autoconvert/gstautoconvert.c +++ b/gst/autoconvert/gstautoconvert.c @@ -1147,7 +1147,7 @@ gst_auto_convert_getcaps (GstAutoConvert * autoconvert, GstCaps * filter, if (element_caps) { if (!gst_caps_is_any (element_caps) && !gst_caps_is_empty (element_caps)) { - gst_caps_merge (caps, element_caps); + caps = gst_caps_merge (caps, element_caps); } else { gst_caps_unref (element_caps); } @@ -1166,7 +1166,7 @@ gst_auto_convert_getcaps (GstAutoConvert * autoconvert, GstCaps * filter, if (static_caps && !gst_caps_is_any (static_caps) && !gst_caps_is_empty (static_caps)) { - gst_caps_merge (caps, static_caps); + caps = gst_caps_merge (caps, static_caps); } } } |