ext/ffmpeg/gstffmpegcolorspace.c: revert previous patch

Original commit message from CVS:
* ext/ffmpeg/gstffmpegcolorspace.c: (gst_ffmpegcsp_getcaps):
revert previous patch
This commit is contained in:
Thomas Vander Stichele 2004-04-30 12:18:46 +00:00
parent acdea61ebc
commit 9bcee66929
2 changed files with 6 additions and 6 deletions

View file

@ -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):

View file

@ -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);