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:
cfd73a8
)
decodebin: don't block on caps
author
Matej Knopp
<matej.knopp@gmail.com>
Wed, 13 Feb 2013 23:54:34 +0000
(
00:54
+0100)
committer
Sebastian Dröge
<sebastian.droege@collabora.co.uk>
Thu, 14 Feb 2013 10:37:54 +0000
(11:37 +0100)
gst/playback/gstdecodebin2.c
patch
|
blob
|
history
diff --git
a/gst/playback/gstdecodebin2.c
b/gst/playback/gstdecodebin2.c
index
e770780
..
e697504
100644
(file)
--- a/
gst/playback/gstdecodebin2.c
+++ b/
gst/playback/gstdecodebin2.c
@@
-3919,6
+3919,11
@@
source_pad_blocked_cb (GstPad * pad, GstPadProbeInfo * info, gpointer user_data)
}
EXPOSE_UNLOCK (dbin);
+ /* If we unblocked due to a caps event, let it go through */
+ if ((GST_PAD_PROBE_INFO_TYPE (info) & GST_PAD_PROBE_TYPE_EVENT_DOWNSTREAM) &&
+ (GST_EVENT_TYPE (GST_PAD_PROBE_INFO_EVENT (info)) == GST_EVENT_CAPS))
+ return GST_PAD_PROBE_PASS;
+
return GST_PAD_PROBE_OK;
}