[0.11] gst-plugins-base: Revert "decodebin2: Try harder to get initial topology caps"

Edward Hervey bilboed at kemper.freedesktop.org
Fri Jan 6 06:40:23 PST 2012


Module: gst-plugins-base
Branch: 0.11
Commit: f5f781e8fb31c8d4a291e49c4b83ae19eb4f8358
URL:    http://cgit.freedesktop.org/gstreamer/gst-plugins-base/commit/?id=f5f781e8fb31c8d4a291e49c4b83ae19eb4f8358

Author: Edward Hervey <edward.hervey at collabora.co.uk>
Date:   Fri Jan  6 15:40:06 2012 +0100

Revert "decodebin2: Try harder to get initial topology caps"

This reverts commit 6b3e3544d41ce0bc42c3597b3eb2130719379917.

I really shouldn't put WIP commits in my main branch ...

---

 gst/playback/gstdecodebin2.c |    8 --------
 1 files changed, 0 insertions(+), 8 deletions(-)

diff --git a/gst/playback/gstdecodebin2.c b/gst/playback/gstdecodebin2.c
index e3501ab..d266d71 100644
--- a/gst/playback/gstdecodebin2.c
+++ b/gst/playback/gstdecodebin2.c
@@ -3512,14 +3512,6 @@ gst_decode_chain_get_topology (GstDecodeChain * chain)
 
   /* Caps that resulted in this chain */
   caps = gst_pad_get_current_caps (chain->pad);
-
-  if (!caps) {
-    /* Try querying the peer sink pad caps.
-     * This will most likely be the case with typefind:src
-     */
-    caps = gst_pad_peer_query_caps (chain->pad, NULL);
-  }
-
   if (!caps) {
     caps = get_pad_caps (chain->pad);
     if (G_UNLIKELY (!gst_caps_is_fixed (caps))) {



More information about the gstreamer-commits mailing list