summaryrefslogtreecommitdiff
path: root/gst/wavenc
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2011-04-29 08:55:19 +0200
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2011-05-14 11:52:12 +0200
commitf8ed8dd6137482bc830e6599b397bdbe854c1e62 (patch)
tree648c75e61408744011d77df9dea50414f03cf2bb /gst/wavenc
parentb6219112b3fd72c64adc6edb2bddecb189b45bb5 (diff)
wavenc: Allow setcaps to be called after a format was negotiated if it's compatible
Otherwise wavenc will fail if upstream decides to set equivalent caps or caps with additional information later. Thanks to Alexander Schremmer for finding this bug.
Diffstat (limited to 'gst/wavenc')
-rw-r--r--gst/wavenc/gstwavenc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/gst/wavenc/gstwavenc.c b/gst/wavenc/gstwavenc.c
index c3b0c5738..7db0e188f 100644
--- a/gst/wavenc/gstwavenc.c
+++ b/gst/wavenc/gstwavenc.c
@@ -275,7 +275,7 @@ gst_wavenc_sink_setcaps (GstPad * pad, GstCaps * caps)
wavenc = GST_WAVENC (gst_pad_get_parent (pad));
- if (wavenc->sent_header) {
+ if (wavenc->sent_header && !gst_caps_can_intersect (caps, GST_PAD_CAPS (pad))) {
GST_WARNING_OBJECT (wavenc, "cannot change format in middle of stream");
goto fail;
}