From 6e19650c976f8be2eb864b81967edb21f4515f2c Mon Sep 17 00:00:00 2001 From: Thomas Vander Stichele Date: Fri, 30 Apr 2004 12:21:11 +0000 Subject: [PATCH] gst/ffmpegcolorspace/gstffmpegcolorspace.c: remove broken nego fix Original commit message from CVS: * gst/ffmpegcolorspace/gstffmpegcolorspace.c: (gst_ffmpegcolorspace_getcaps): remove broken nego fix --- ChangeLog | 6 ++++++ gst/ffmpegcolorspace/gstffmpegcolorspace.c | 6 +----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index f7b5000..2563d1c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2004-04-30 Thomas Vander Stichele + + * gst/ffmpegcolorspace/gstffmpegcolorspace.c: + (gst_ffmpegcolorspace_getcaps): + remove broken nego fix + 2004-04-30 Benjamin Otte * configure.ac: diff --git a/gst/ffmpegcolorspace/gstffmpegcolorspace.c b/gst/ffmpegcolorspace/gstffmpegcolorspace.c index 922b26c..f20272b 100644 --- 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); -- 2.7.4