summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--ChangeLog18
-rw-r--r--ext/faac/gstfaac.c2
-rw-r--r--ext/jack/gstjack.c2
-rw-r--r--ext/xvid/gstxviddec.c2
-rw-r--r--gst-libs/gst/play/gstplay.c2
-rw-r--r--gst-libs/gst/play/play.c2
-rw-r--r--gst-libs/gst/play/play.old.c2
7 files changed, 24 insertions, 6 deletions
diff --git a/ChangeLog b/ChangeLog
index 1be20b9d..1457ec2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,23 @@
2004-01-11 David Schleef <ds@schleef.org>
+ * ext/alsa/gstalsasrc.c: (gst_alsa_src_set_caps):
+ * ext/faac/gstfaac.c: (gst_faac_sinkconnect):
+ * ext/gdk_pixbuf/gstgdkanimation.c:
+ (gst_gdk_animation_iter_create_pixbuf):
+ * ext/gdk_pixbuf/gstgdkpixbuf.c: (gst_gdk_pixbuf_sink_link),
+ (gst_gdk_pixbuf_chain):
+ * ext/gdk_pixbuf/gstgdkpixbuf.h:
+ * ext/jack/gstjack.c: (gst_jack_change_state):
+ * ext/xvid/gstxviddec.c: (gst_xviddec_sink_link):
+ * gst-libs/gst/play/gstplay.c: (gst_play_get_sink_element):
+ * gst-libs/gst/play/play.c: (gst_play_get_sink_element):
+ * gst/videofilter/gstvideofilter.c:
+ (gst_videofilter_set_output_size):
+ Remove all usage of gst_pad_get_caps(), and replace it with
+ gst_pad_get_allowed_caps() or gst_pad_get_negotiated_cap().
+
+2004-01-11 David Schleef <ds@schleef.org>
+
* configure.ac:
* ext/Makefile.am: Fixes to make ext/libcaca compile.
* ext/divx/gstdivxdec.c:
diff --git a/ext/faac/gstfaac.c b/ext/faac/gstfaac.c
index b5e4f9f6..182d094e 100644
--- a/ext/faac/gstfaac.c
+++ b/ext/faac/gstfaac.c
@@ -315,7 +315,7 @@ gst_faac_sinkconnect (GstPad *pad,
/* if the other side was already set-up, redo that */
if (GST_PAD_CAPS (faac->srcpad))
return gst_faac_srcconnect (faac->srcpad,
- gst_pad_get_caps (GST_PAD_PEER (faac->srcpad)));
+ gst_pad_get_allowed_caps (faac->srcpad));
/* else, that'll be done later */
return GST_PAD_LINK_OK;
diff --git a/ext/jack/gstjack.c b/ext/jack/gstjack.c
index 4a987ae1..a43c6707 100644
--- a/ext/jack/gstjack.c
+++ b/ext/jack/gstjack.c
@@ -392,7 +392,7 @@ gst_jack_change_state (GstElement *element)
l = this->pads;
while (l) {
pad = GST_JACK_PAD (l);
- caps = gst_pad_get_caps (pad->pad);
+ caps = gst_caps_copy (gst_pad_get_negotiated_caps (pad->pad));
gst_caps_set_simple (caps,
"rate", G_TYPE_INT, (int)this->bin->rate,
"buffer-frames", G_TYPE_INT, (gint)this->bin->nframes,
diff --git a/ext/xvid/gstxviddec.c b/ext/xvid/gstxviddec.c
index c74b9947..e57489a6 100644
--- a/ext/xvid/gstxviddec.c
+++ b/ext/xvid/gstxviddec.c
@@ -364,7 +364,7 @@ g_print ("in: %dx%d\n", xviddec->width, xviddec->height);
/* re-nego? or just await src nego? */
if (GST_PAD_CAPS(xviddec->srcpad)) {
GstPadLinkReturn ret;
- GstCaps *vscaps = gst_pad_get_caps (GST_PAD_PEER (xviddec->srcpad)), *new;
+ GstCaps *vscaps = gst_pad_get_allowed_caps (xviddec->srcpad), *new;
gint i, csp;
for (i = 0; i < gst_caps_get_size (vscaps); i++) {
diff --git a/gst-libs/gst/play/gstplay.c b/gst-libs/gst/play/gstplay.c
index 7c7ef849..bcc5c4d1 100644
--- a/gst-libs/gst/play/gstplay.c
+++ b/gst-libs/gst/play/gstplay.c
@@ -928,7 +928,7 @@ gst_play_get_sink_element (GstPlay *play,
gboolean has_video_cap = FALSE;
gboolean has_audio_cap = FALSE;
- caps = gst_pad_get_caps (GST_PAD (pads->data));
+ caps = gst_pad_get_negotiated_caps (GST_PAD (pads->data));
structure = gst_caps_get_structure (caps, 0);
if (strcmp (gst_structure_get_name (structure),
diff --git a/gst-libs/gst/play/play.c b/gst-libs/gst/play/play.c
index 7c7ef849..bcc5c4d1 100644
--- a/gst-libs/gst/play/play.c
+++ b/gst-libs/gst/play/play.c
@@ -928,7 +928,7 @@ gst_play_get_sink_element (GstPlay *play,
gboolean has_video_cap = FALSE;
gboolean has_audio_cap = FALSE;
- caps = gst_pad_get_caps (GST_PAD (pads->data));
+ caps = gst_pad_get_negotiated_caps (GST_PAD (pads->data));
structure = gst_caps_get_structure (caps, 0);
if (strcmp (gst_structure_get_name (structure),
diff --git a/gst-libs/gst/play/play.old.c b/gst-libs/gst/play/play.old.c
index 513a3e12..e8c2daf6 100644
--- a/gst-libs/gst/play/play.old.c
+++ b/gst-libs/gst/play/play.old.c
@@ -911,7 +911,7 @@ gst_play_get_sink_element (GstPlay * play,
const char *media_type;
media_type = gst_structure_get_name (gst_caps_get_structure (
- gst_pad_get_caps (GST_PAD (pads->data)), 0));
+ gst_pad_get_negotiated_caps (GST_PAD (pads->data)), 0));
if (strcmp (media_type, "audio/x-raw-int") == 0)
{
has_audio_cap = TRUE;