projects
/
platform
/
upstream
/
gstreamer.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ed1247b
)
gstpad: directly set the caps when pushing buffer with different caps.
author
Thijs Vermeir
<thijsvermeir@gmail.com>
Tue, 19 Jan 2010 13:07:23 +0000
(14:07 +0100)
committer
Thijs Vermeir
<thijsvermeir@gmail.com>
Tue, 19 Jan 2010 13:13:25 +0000
(14:13 +0100)
This check is not necesarry as we are not negotiating anymore. And it can
be wrong if upstream can't produce this caps anymore, but downstream can
process them fine.
gst/gstpad.c
patch
|
blob
|
history
diff --git
a/gst/gstpad.c
b/gst/gstpad.c
index
e0801a0
..
f0fa188
100644
(file)
--- a/
gst/gstpad.c
+++ b/
gst/gstpad.c
@@
-4344,7
+4344,7
@@
gst_pad_push_data (GstPad * pad, gboolean is_buffer, void *data)
GST_DEBUG_OBJECT (pad,
"caps changed from %" GST_PTR_FORMAT " to %p %" GST_PTR_FORMAT,
GST_PAD_CAPS (pad), caps, caps);
- if (G_UNLIKELY (!gst_pad_
configure_src (pad, caps, TRUE
)))
+ if (G_UNLIKELY (!gst_pad_
set_caps (pad, caps
)))
goto not_negotiated;
}