ext/alsa/gstalsa.c: simplify caps

Original commit message from CVS:
* ext/alsa/gstalsa.c: (gst_alsa_caps), (gst_alsa_get_caps):
simplify caps

diff --git a/ChangeLog b/ChangeLog
index 9d9c361..382445b 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2004-05-16  Benjamin Otte  <otte@gnome.org>
 
+       * ext/alsa/gstalsa.c: (gst_alsa_caps), (gst_alsa_get_caps):
+         simplify caps
+
+2004-05-16  Benjamin Otte  <otte@gnome.org>
+
        * gst/asfdemux/gstasfdemux.c: (gst_asf_demux_process_comment):
          don't write to memory we might not write to - g_convert does that
          for us anyway (fixes #142613)

diff --git a/ext/alsa/gstalsa.c b/ext/alsa/gstalsa.c
index 108ad0c..129b575 100644 (file)
--- a/ext/alsa/gstalsa.c
+++ b/ext/alsa/gstalsa.c
@@ -747,6 +747,7 @@ gst_alsa_caps (snd_pcm_format_t format, gint rate, gint channels)
     }
   }
 
+  gst_caps_do_simplify (ret_caps);
   return ret_caps;
 }
 
@@ -817,8 +818,10 @@ gst_alsa_get_caps (GstPad * pad)
     GST_WARNING_OBJECT (this, "no supported caps found, returning empty caps");
     return gst_caps_new_empty ();
   } else {
-    G_GNUC_UNUSED gchar *str = gst_caps_to_string (ret);
+    G_GNUC_UNUSED gchar *str;
 
+    gst_caps_do_simplify (ret);
+    str = gst_caps_to_string (ret);
     GST_LOG_OBJECT (this, "get_caps returns %s", str);
     g_free (str);
     return ret;