audioconvert: cleanup helper code

make_lossless_changes() returns the same structure that we're passing (probably
to enable chaining). Instead of reusing s and making it point to s2 as well,
keep using s2. Drop the assignment which in the 2nd case is a dead one anyway.

diff --git a/gst/audioconvert/gstaudioconvert.c b/gst/audioconvert/gstaudioconvert.c
index 2b3445a..188c191 100644 (file)
--- a/gst/audioconvert/gstaudioconvert.c
+++ b/gst/audioconvert/gstaudioconvert.c
@@ -503,15 +503,15 @@ append_with_other_format (GstCaps * caps, GstStructure * s, gboolean isfloat)
   if (isfloat) {
     s2 = gst_structure_copy (s);
     gst_structure_set_name (s2, "audio/x-raw-int");
-    s = make_lossless_changes (s2, FALSE);
+    make_lossless_changes (s2, FALSE);
     /* If 64 bit float was allowed; remove width 64: we don't support it for 
      * integer*/
-    strip_width_64 (s);
+    strip_width_64 (s2);
     gst_caps_append_structure (caps, s2);
   } else {
     s2 = gst_structure_copy (s);
     gst_structure_set_name (s2, "audio/x-raw-float");
-    s = make_lossless_changes (s2, TRUE);
+    make_lossless_changes (s2, TRUE);
     gst_caps_append_structure (caps, s2);
   }
 }