ext/dvdnav/README: Update the README to use dvddemux

Original commit message from CVS:
* ext/dvdnav/README:
Update the README to use dvddemux
* ext/gdk_pixbuf/pixbufscale.c: (gst_pixbufscale_getcaps):
Ensure getcaps returns a subset of the template caps
* gst/mpeg2sub/gstmpeg2subt.c: (gst_mpeg2subt_base_init),
(gst_mpeg2subt_init):
Ensure getcaps returns a subset of the template caps
* gst/mpegstream/gstdvddemux.c: (gst_dvd_demux_class_init),
(gst_dvd_demux_init), (gst_dvd_demux_get_video_stream),
(gst_dvd_demux_get_subpicture_stream),
(gst_dvd_demux_send_subbuffer), (gst_dvd_demux_set_cur_subpicture):
* gst/mpegstream/gstdvddemux.h:
Set the explicit caps on the current_video pad before pushing
anything
* gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_get_video_stream),
(gst_mpeg_demux_get_audio_stream):
Free caps used to gst_pad_set_explicit_caps, which takes a const
GstCaps *

2 files changed, 23 insertions, 9 deletions

diff --git a/ChangeLog b/ChangeLog
index 86bc3705..8252702f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,24 @@
+2004-07-28  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* ext/dvdnav/README:
+	  Update the README to use dvddemux
+	* ext/gdk_pixbuf/pixbufscale.c: (gst_pixbufscale_getcaps):
+	  Ensure getcaps returns a subset of the template caps
+	* gst/mpeg2sub/gstmpeg2subt.c: (gst_mpeg2subt_base_init),
+	(gst_mpeg2subt_init):
+	  Ensure getcaps returns a subset of the template caps
+	* gst/mpegstream/gstdvddemux.c: (gst_dvd_demux_class_init),
+	(gst_dvd_demux_init), (gst_dvd_demux_get_video_stream),
+	(gst_dvd_demux_get_subpicture_stream),
+	(gst_dvd_demux_send_subbuffer), (gst_dvd_demux_set_cur_subpicture):
+	* gst/mpegstream/gstdvddemux.h:
+	  Set the explicit caps on the current_video pad before pushing
+	  anything
+	* gst/mpegstream/gstmpegdemux.c: (gst_mpeg_demux_get_video_stream),
+	(gst_mpeg_demux_get_audio_stream):
+	  Free caps used to gst_pad_set_explicit_caps, which takes a const
+	  GstCaps *
+
 2004-07-28  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* configure.ac: update GStreamer requirement to 0.8.4 because of
diff --git a/ext/gdk_pixbuf/pixbufscale.c b/ext/gdk_pixbuf/pixbufscale.c
index 5d4d0442..8dca4d37 100644
--- a/ext/gdk_pixbuf/pixbufscale.c
+++ b/ext/gdk_pixbuf/pixbufscale.c
@@ -164,7 +164,6 @@ gst_pixbufscale_getcaps (GstPad * pad)
   GstCaps *othercaps;
   GstCaps *caps;
   GstPad *otherpad;
-  int i;
 
   pixbufscale = GST_PIXBUFSCALE (gst_pad_get_parent (pad));
 
@@ -172,14 +171,8 @@ gst_pixbufscale_getcaps (GstPad * pad)
       pixbufscale->srcpad;
   othercaps = gst_pad_get_allowed_caps (otherpad);
 
-  caps = gst_caps_copy (othercaps);
-  for (i = 0; i < gst_caps_get_size (caps); i++) {
-    GstStructure *structure = gst_caps_get_structure (caps, i);
-
-    gst_structure_set (structure,
-        "width", GST_TYPE_INT_RANGE, 16, G_MAXINT,
-        "height", GST_TYPE_INT_RANGE, 16, G_MAXINT, NULL);
-  }
+  caps = gst_caps_intersect (othercaps, gst_pad_get_pad_template_caps (pad));
+  gst_caps_free (othercaps);
 
   GST_DEBUG ("getcaps are: %" GST_PTR_FORMAT, caps);
   return caps;