diff --git a/ext/flac/gstflacdec.c b/ext/flac/gstflacdec.c index 4a4bdd6e98..10f4527941 100644 --- a/ext/flac/gstflacdec.c +++ b/ext/flac/gstflacdec.c @@ -115,9 +115,9 @@ static GstFlowReturn gst_flac_dec_handle_frame (GstAudioDecoder * audio_dec, 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 \ diff --git a/ext/flac/gstflacenc.c b/ext/flac/gstflacenc.c index e71e5cd2ae..e789295dfe 100644 --- a/ext/flac/gstflacenc.c +++ b/ext/flac/gstflacenc.c @@ -98,9 +98,9 @@ static const GstAudioChannelPosition channel_positions[8][8] = { }; #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 * enc, GstCaps * filter) 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); diff --git a/gst/cutter/gstcutter.c b/gst/cutter/gstcutter.c index 2c373664c1..d643de1f28 100644 --- a/gst/cutter/gstcutter.c +++ b/gst/cutter/gstcutter.c @@ -69,7 +69,7 @@ static GstStaticPadTemplate cutter_src_factory = GST_STATIC_PAD_TEMPLATE ("src", 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") );