gst/ffmpegcolorspace/gstffmpegcolorspace.c: remove broken nego fix

Original commit message from CVS:
* gst/ffmpegcolorspace/gstffmpegcolorspace.c:
(gst_ffmpegcolorspace_getcaps):
remove broken nego fix

diff --git a/ChangeLog b/ChangeLog
index f7b5000..2563d1c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2004-04-30  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       * gst/ffmpegcolorspace/gstffmpegcolorspace.c:
+       (gst_ffmpegcolorspace_getcaps):
+          remove broken nego fix
+
 2004-04-30  Benjamin Otte  <otte@gnome.org>
 
        * configure.ac:

diff --git a/gst/ffmpegcolorspace/gstffmpegcolorspace.c b/gst/ffmpegcolorspace/gstffmpegcolorspace.c
index 922b26c..f20272b 100644 (file)
--- a/gst/ffmpegcolorspace/gstffmpegcolorspace.c
+++ b/gst/ffmpegcolorspace/gstffmpegcolorspace.c
@@ -151,11 +151,7 @@ gst_ffmpegcolorspace_getcaps (GstPad * pad)
 
   otherpad = (pad == space->srcpad) ? space->sinkpad : space->srcpad;
 
-  /* use already negotiated caps if they exist */
-  if (GST_PAD_CAPS (otherpad))
-    othercaps = gst_caps_copy (GST_PAD_CAPS (otherpad));
-  if (!othercaps)
-    othercaps = gst_pad_get_allowed_caps (otherpad);
+  othercaps = gst_pad_get_allowed_caps (otherpad);
 
   othercaps = gst_ffmpegcolorspace_caps_remove_format_info (othercaps);