summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorStéphane Loeuillet <gstreamer@leroutier.net>2004-10-06 15:12:08 +0000
committerStéphane Loeuillet <gstreamer@leroutier.net>2004-10-06 15:12:08 +0000
commit515dc1aba55d81f3da811897811f79fd4742c53a (patch)
tree58e97580f5a77d45571439eaaa67631149a1ed2e
parent9ba183e760824eba4474c3d3d013191cbcfdf9d3 (diff)
gst/wavparse/gstwavparse.c: add ATRAC3 to STATIC CAPS to fix a warning
Original commit message from CVS: * gst/wavparse/gstwavparse.c: add ATRAC3 to STATIC CAPS to fix a warning * gst/matroska/ebml-read.c: * gst-libs/gst/riff/riff-read.c: fix typos
-rw-r--r--ChangeLog9
-rw-r--r--gst/matroska/ebml-read.c2
-rw-r--r--gst/wavparse/gstwavparse.c3
3 files changed, 12 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index d951411b..5c5ddb20 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,14 @@
2004-10-06 Stephane Loeuillet <stephane.loeuillet@tiscali.fr>
+ * gst/wavparse/gstwavparse.c:
+ add ATRAC3 to STATIC CAPS to fix a warning
+
+ * gst/matroska/ebml-read.c:
+ * gst-libs/gst/riff/riff-read.c:
+ fix typos
+
+2004-10-06 Stephane Loeuillet <stephane.loeuillet@tiscali.fr>
+
* gst-libs/gst/riff/riff-media.c:
generate caps for ATRAC3 audio streams
diff --git a/gst/matroska/ebml-read.c b/gst/matroska/ebml-read.c
index 0ec5aac3..72a3bb7e 100644
--- a/gst/matroska/ebml-read.c
+++ b/gst/matroska/ebml-read.c
@@ -142,7 +142,7 @@ gst_ebml_read_use_event (GstEbmlRead * ebml, GstEvent * event)
return FALSE;
case GST_EVENT_DISCONTINUOUS:
- GST_WARNING_OBJECT (ebml, "Unexected discont - might lose sync");
+ GST_WARNING_OBJECT (ebml, "Unexpected discont - might lose sync");
gst_pad_event_default (ebml->sinkpad, event);
return TRUE;
diff --git a/gst/wavparse/gstwavparse.c b/gst/wavparse/gstwavparse.c
index 75253261..678e49fe 100644
--- a/gst/wavparse/gstwavparse.c
+++ b/gst/wavparse/gstwavparse.c
@@ -91,7 +91,8 @@ static GstStaticPadTemplate src_template_factory =
"audio/x-adpcm, "
"layout = (string) dvi, "
"block_align = (int) [ 1, 8192 ], "
- "rate = (int) [ 8000, 48000 ], " "channels = (int) [ 1, 2 ]")
+ "rate = (int) [ 8000, 48000 ], " "channels = (int) [ 1, 2 ];"
+ "audio/x-vnd.sony.atrac3")
);
/* WavParse signals and args */