summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Dröge <slomo@circular-chaos.org>2007-03-22 16:25:56 +0000
committerSebastian Dröge <slomo@circular-chaos.org>2007-03-22 16:25:56 +0000
commitdd18cbc2a3dba89e4f4fe5a34e781fbd3e5bad8f (patch)
treea4dcb1d273a719101dd45eb6fea522f16aa3e2f3
parent8d8d278b9aec1df81fbc7c7cb3fe7aad999cb0d4 (diff)
downloadgst-plugins-bad-dd18cbc2a3dba89e4f4fe5a34e781fbd3e5bad8f.tar.gz
gst-plugins-bad-dd18cbc2a3dba89e4f4fe5a34e781fbd3e5bad8f.tar.bz2
gst-plugins-bad-dd18cbc2a3dba89e4f4fe5a34e781fbd3e5bad8f.zip
ext/wavpack/gstwavpackparse.c: Revert last commit, preventing infinite plugging loops with ranks is no clean solution...
Original commit message from CVS: * ext/wavpack/gstwavpackparse.c: (gst_wavpack_parse_plugin_init): Revert last commit, preventing infinite plugging loops with ranks is no clean solution and in general there's no reason why one wants to parse framed wavpack data again.
-rw-r--r--ChangeLog7
-rw-r--r--ext/wavpack/gstwavpackparse.c6
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 27551c81..945338e1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2007-03-22 Sebastian Dröge <slomo@circular-chaos.org>
+ * ext/wavpack/gstwavpackparse.c: (gst_wavpack_parse_plugin_init):
+ Revert last commit, preventing infinite plugging loops with ranks
+ is no clean solution and in general there's no reason why one wants
+ to parse framed wavpack data again.
+
+2007-03-22 Sebastian Dröge <slomo@circular-chaos.org>
+
* ext/wavpack/gstwavpackenc.c: (gst_wavpack_enc_push_block):
Send the new segment event in time format instead of bytes. This
allows "wavpackenc ! wavpackdec ! someaudiosink" pipelines.
diff --git a/ext/wavpack/gstwavpackparse.c b/ext/wavpack/gstwavpackparse.c
index 7d72f063..c484a10d 100644
--- a/ext/wavpack/gstwavpackparse.c
+++ b/ext/wavpack/gstwavpackparse.c
@@ -56,7 +56,9 @@ GST_DEBUG_CATEGORY_STATIC (gst_wavpack_parse_debug);
static GstStaticPadTemplate sink_factory = GST_STATIC_PAD_TEMPLATE ("sink",
GST_PAD_SINK,
GST_PAD_ALWAYS,
- GST_STATIC_CAPS ("audio/x-wavpack; " "audio/x-wavpack-correction")
+ GST_STATIC_CAPS ("audio/x-wavpack, "
+ "framed = (boolean) false; "
+ "audio/x-wavpack-correction, " "framed = (boolean) false")
);
static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
@@ -1171,7 +1173,7 @@ gboolean
gst_wavpack_parse_plugin_init (GstPlugin * plugin)
{
if (!gst_element_register (plugin, "wavpackparse",
- GST_RANK_PRIMARY - 1, GST_TYPE_WAVPACK_PARSE)) {
+ GST_RANK_PRIMARY, GST_TYPE_WAVPACK_PARSE)) {
return FALSE;
}