ext/ffmpeg/gstffmpegcolorspace.c: revert previous patch

Original commit message from CVS:
* ext/ffmpeg/gstffmpegcolorspace.c: (gst_ffmpegcsp_getcaps):
revert previous patch

diff --git a/ChangeLog b/ChangeLog
index 672bafd..e845396 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-04-30  Thomas Vander Stichele  <thomas at apestaart dot org>
+
+       * ext/ffmpeg/gstffmpegcolorspace.c: (gst_ffmpegcsp_getcaps):
+          revert previous patch
+
 2004-04-29  Thomas Vander Stichele  <thomas at apestaart dot org>
 
        * ext/ffmpeg/gstffmpegcolorspace.c: (gst_ffmpegcsp_getcaps):

diff --git a/ext/ffmpeg/gstffmpegcolorspace.c b/ext/ffmpeg/gstffmpegcolorspace.c
index 74d18d0..635851a 100644 (file)
--- a/ext/ffmpeg/gstffmpegcolorspace.c
+++ b/ext/ffmpeg/gstffmpegcolorspace.c
@@ -154,12 +154,7 @@ gst_ffmpegcsp_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_ffmpegcsp_caps_remove_format_info (othercaps);