From bcbf0488bf97e691907897c8368587c3771a693d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= <sebastian.droege@collabora.co.uk>
Date: Mon, 16 May 2011 12:20:34 +0200
Subject: [PATCH] ogg: Update for negotiation related API changes

---
 ext/ogg/gstoggdemux.c | 10 +---------
 ext/ogg/gstoggmux.c   |  2 +-
 ext/ogg/gstoggparse.c |  2 +-
 3 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/ext/ogg/gstoggdemux.c b/ext/ogg/gstoggdemux.c
index bf6c7a876d..e9143ed60e 100644
--- a/ext/ogg/gstoggdemux.c
+++ b/ext/ogg/gstoggdemux.c
@@ -114,7 +114,6 @@ static void gst_ogg_pad_finalize (GObject * object);
 static const GstQueryType *gst_ogg_pad_query_types (GstPad * pad);
 static gboolean gst_ogg_pad_src_query (GstPad * pad, GstQuery ** query);
 static gboolean gst_ogg_pad_event (GstPad * pad, GstEvent * event);
-static GstCaps *gst_ogg_pad_getcaps (GstPad * pad);
 static GstOggPad *gst_ogg_chain_get_stream (GstOggChain * chain,
     glong serialno);
 
@@ -144,12 +143,11 @@ gst_ogg_pad_init (GstOggPad * pad)
 {
   gst_pad_set_event_function (GST_PAD (pad),
       GST_DEBUG_FUNCPTR (gst_ogg_pad_event));
-  gst_pad_set_getcaps_function (GST_PAD (pad),
-      GST_DEBUG_FUNCPTR (gst_ogg_pad_getcaps));
   gst_pad_set_query_type_function (GST_PAD (pad),
       GST_DEBUG_FUNCPTR (gst_ogg_pad_query_types));
   gst_pad_set_query_function (GST_PAD (pad),
       GST_DEBUG_FUNCPTR (gst_ogg_pad_src_query));
+  gst_pad_use_fixed_caps (GST_PAD (pad));
 
   pad->mode = GST_OGG_PAD_MODE_INIT;
 
@@ -226,12 +224,6 @@ gst_ogg_pad_query_types (GstPad * pad)
   return query_types;
 }
 
-static GstCaps *
-gst_ogg_pad_getcaps (GstPad * pad)
-{
-  return gst_pad_get_current_caps (pad);
-}
-
 static gboolean
 gst_ogg_pad_src_query (GstPad * pad, GstQuery ** query)
 {
diff --git a/ext/ogg/gstoggmux.c b/ext/ogg/gstoggmux.c
index 80488e1ef4..59927f91cf 100644
--- a/ext/ogg/gstoggmux.c
+++ b/ext/ogg/gstoggmux.c
@@ -1187,7 +1187,7 @@ gst_ogg_mux_send_headers (GstOggMux * mux)
   /* hbufs holds all buffers for the headers now */
 
   /* create caps with the buffers */
-  caps = gst_pad_get_caps (mux->srcpad);
+  caps = gst_pad_get_caps (mux->srcpad, NULL);
   if (caps) {
     caps = gst_ogg_mux_set_header_on_caps (caps, hbufs);
     gst_pad_set_caps (mux->srcpad, caps);
diff --git a/ext/ogg/gstoggparse.c b/ext/ogg/gstoggparse.c
index 42949c185c..27738c2121 100644
--- a/ext/ogg/gstoggparse.c
+++ b/ext/ogg/gstoggparse.c
@@ -582,7 +582,7 @@ gst_ogg_parse_chain (GstPad * pad, GstBuffer * buffer)
               }
             }
 
-            caps = gst_pad_get_caps (ogg->srcpad);
+            caps = gst_pad_get_caps (ogg->srcpad, NULL);
             caps = gst_caps_make_writable (caps);
 
             structure = gst_caps_get_structure (caps, 0);