From 5975b01b0167b260f511c1608ac4f728a0d2777a Mon Sep 17 00:00:00 2001 From: Thiago Santos Date: Mon, 11 Jan 2010 13:26:32 -0300 Subject: [PATCH] avimux: matroskamux: rename aac's stream-format to raw AAC's none stream-format has been renamed to raw, rename on avimux and matroskamux as well --- gst/avi/gstavimux.c | 8 ++++---- gst/matroska/matroska-mux.c | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gst/avi/gstavimux.c b/gst/avi/gstavimux.c index 8d61895..7dcb5c3 100644 --- a/gst/avi/gstavimux.c +++ b/gst/avi/gstavimux.c @@ -174,7 +174,7 @@ static GstStaticPadTemplate audio_sink_factory = "rate = (int) [ 1000, 96000 ], " "channels = (int) [ 1, 2 ]; " "audio/mpeg, " "mpegversion = (int) 4, " - "stream-format = (string) none, " + "stream-format = (string) raw, " "rate = (int) [ 1000, 96000 ], " "channels = (int) [ 1, 2 ]; " /*#if 0 VC6 doesn't support #if here ... "audio/x-vorbis, " @@ -853,14 +853,14 @@ gst_avi_mux_audsink_set_caps (GstPad * pad, GstCaps * vscaps) stream_format = gst_structure_get_string (structure, "stream-format"); if (stream_format) { - if (strcmp (stream_format, "none") != 0) { + if (strcmp (stream_format, "raw") != 0) { GST_WARNING_OBJECT (avimux, "AAC's stream format '%s' is not " - "supported, please use 'none'", stream_format); + "supported, please use 'raw'", stream_format); break; } } else { GST_WARNING_OBJECT (avimux, "AAC's stream-format not specified, " - "assuming 'none'"); + "assuming 'raw'"); } /* vbr case needs some special handling */ diff --git a/gst/matroska/matroska-mux.c b/gst/matroska/matroska-mux.c index fa45637..9c034a8 100644 --- a/gst/matroska/matroska-mux.c +++ b/gst/matroska/matroska-mux.c @@ -136,7 +136,7 @@ static GstStaticPadTemplate audiosink_templ = GST_STATIC_CAPS ("audio/mpeg, " "mpegversion = (int) 1, " "layer = (int) [ 1, 3 ], " - "stream-format = (string) { none }, " + "stream-format = (string) { raw }, " COMMON_AUDIO_CAPS "; " "audio/mpeg, " "mpegversion = (int) { 2, 4 }, " @@ -1510,13 +1510,13 @@ gst_matroska_mux_audio_pad_setcaps (GstPad * pad, GstCaps * caps) stream_format = gst_structure_get_string (structure, "stream-format"); /* check this is raw aac */ if (stream_format) { - if (strcmp (stream_format, "none") != 0) { - GST_WARNING_OBJECT (mux, "AAC stream-format must be 'none', not %s", + if (strcmp (stream_format, "raw") != 0) { + GST_WARNING_OBJECT (mux, "AAC stream-format must be 'raw', not %s", stream_format); } } else { GST_WARNING_OBJECT (mux, "AAC stream-format not specified, " - "assuming 'none'"); + "assuming 'raw'"); } if (buf) { -- 2.7.4