diff options
-rw-r--r-- | ChangeLog | 10 | ||||
-rw-r--r-- | ext/hermes/gsthermescolorspace.c | 6 | ||||
-rw-r--r-- | gst/colorspace/gstcolorspace.c | 7 |
3 files changed, 14 insertions, 9 deletions
@@ -1,5 +1,15 @@ 2004-04-22 Benjamin Otte <otte@gnome.org> + * ext/hermes/gsthermescolorspace.c: + (gst_hermes_colorspace_caps_remove_format_info): + * gst/colorspace/gstcolorspace.c: + (gst_colorspace_caps_remove_format_info): + * gst/ffmpegcolorspace/gstffmpegcolorspace.c: + (gst_ffmpegcolorspace_caps_remove_format_info): + s/gst_caps_simplify/gst_caps_do_simplify/ + +2004-04-22 Benjamin Otte <otte@gnome.org> + * gst-libs/gst/riff/riff-media.c: (gst_riff_create_video_caps_with_data): mpegversion is an int diff --git a/ext/hermes/gsthermescolorspace.c b/ext/hermes/gsthermescolorspace.c index 78c7ec1c..732c7908 100644 --- a/ext/hermes/gsthermescolorspace.c +++ b/ext/hermes/gsthermescolorspace.c @@ -307,7 +307,6 @@ gst_hermes_colorspace_caps_remove_format_info (GstCaps * caps) { int i; GstStructure *structure; - GstCaps *rgbcaps; for (i = 0; i < gst_caps_get_size (caps); i++) { structure = gst_caps_get_structure (caps, i); @@ -321,10 +320,9 @@ gst_hermes_colorspace_caps_remove_format_info (GstCaps * caps) gst_structure_remove_field (structure, "blue_mask"); } - rgbcaps = gst_caps_simplify (caps); - gst_caps_free (caps); + gst_caps_do_simplify (caps); - return rgbcaps; + return caps; } static void diff --git a/gst/colorspace/gstcolorspace.c b/gst/colorspace/gstcolorspace.c index 86294960..d4ef35d5 100644 --- a/gst/colorspace/gstcolorspace.c +++ b/gst/colorspace/gstcolorspace.c @@ -263,7 +263,6 @@ gst_colorspace_caps_remove_format_info (GstCaps * caps, const char *media_type) { int i; GstStructure *structure; - GstCaps *rgbcaps; for (i = 0; i < gst_caps_get_size (caps); i++) { structure = gst_caps_get_structure (caps, i); @@ -278,10 +277,8 @@ gst_colorspace_caps_remove_format_info (GstCaps * caps, const char *media_type) gst_structure_remove_field (structure, "blue_mask"); } - rgbcaps = gst_caps_simplify (caps); - gst_caps_free (caps); - - return rgbcaps; + gst_caps_do_simplify (caps); + return caps; } static GstCaps * |