--- gst/cutter/gstcutter.c	2013-09-24 15:05:22.000000000 +0200
+++ gst/cutter/gstcutter.c	2014-01-31 22:08:58.319708485 +0100
@@ -69,7 +69,7 @@ static GstStaticPadTemplate cutter_src_f
     GST_PAD_SRC,
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("audio/x-raw, "
-        "format = (string) { " GST_AUDIO_NE (S8) "," GST_AUDIO_NE (S16) " }, "
+        "format = (string) { S8," GST_AUDIO_NE (S16) " }, "
         "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, MAX ], "
         "layout = (string) interleaved")
     );
@@ -79,7 +79,7 @@ GST_STATIC_PAD_TEMPLATE ("sink",
     GST_PAD_SINK,
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("audio/x-raw, "
-        "format = (string) { " GST_AUDIO_NE (S8) "," GST_AUDIO_NE (S16) " }, "
+        "format = (string) { S8," GST_AUDIO_NE (S16) " }, "
         "rate = (int) [ 1, MAX ], " "channels = (int) [ 1, MAX ], "
         "layout = (string) interleaved")
     );
--- ext/flac/gstflacdec.c	2013-09-24 15:05:22.000000000 +0200
+++ ext/flac/gstflacdec.c	2014-01-31 22:06:53.417340295 +0100
@@ -115,9 +115,9 @@ static GstFlowReturn gst_flac_dec_handle
 G_DEFINE_TYPE (GstFlacDec, gst_flac_dec, GST_TYPE_AUDIO_DECODER);
 
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
-#define FORMATS "{ S8LE, S16LE, S24_32LE, S32LE } "
+#define FORMATS "{ S8, S16LE, S24_32LE, S32LE } "
 #else
-#define FORMATS "{ S8BE, S16BE, S24_32BE, S32BE } "
+#define FORMATS "{ S8, S16BE, S24_32BE, S32BE } "
 #endif
 
 #define GST_FLAC_DEC_SRC_CAPS                             \
--- ext/flac/gstflacenc.c	2013-09-24 15:05:22.000000000 +0200
+++ ext/flac/gstflacenc.c	2014-01-31 22:06:41.321498324 +0100
@@ -98,9 +98,9 @@ static const GstAudioChannelPosition cha
 };
 
 #if G_BYTE_ORDER == G_LITTLE_ENDIAN
-#define FORMATS "{ S8LE, S16LE, S24LE, S24_32LE } "
+#define FORMATS "{ S8, S16LE, S24LE, S24_32LE } "
 #else
-#define FORMATS "{ S8BE, S16BE, S24BE, S24_32BE } "
+#define FORMATS "{ S8, S16BE, S24BE, S24_32BE } "
 #endif
 
 #define FLAC_SINK_CAPS                                    \
@@ -734,7 +734,7 @@ gst_flac_enc_getcaps (GstAudioEncoder *
     g_value_init (&v_list, GST_TYPE_LIST);
     g_value_init (&v, G_TYPE_STRING);
 
-    g_value_set_static_string (&v, GST_AUDIO_NE (S8));
+    g_value_set_static_string (&v, "S8");
     gst_value_list_append_value (&v_list, &v);
     g_value_set_static_string (&v, GST_AUDIO_NE (S16));
     gst_value_list_append_value (&v_list, &v);
