From cf06fbf1b75909a71f48166d314cabc70e391fe1 Mon Sep 17 00:00:00 2001
From: Jan Schmidt <thaytan@mad.scientist.com>
Date: Fri, 24 Aug 2007 15:55:03 +0000
Subject: [PATCH] gst/dvdlpcmdec/gstdvdlpcmdec.c: Add other allowed rates to
 the pad templates.

Original commit message from CVS:
* gst/dvdlpcmdec/gstdvdlpcmdec.c:
Add other allowed rates to the pad templates.
* gst/mpegaudioparse/gstmpegaudioparse.c: (gst_mp3parse_dispose):
Reset the parser to release memory in dispose.
---
 ChangeLog                              | 8 ++++++++
 common                                 | 2 +-
 gst/dvdlpcmdec/gstdvdlpcmdec.c         | 4 ++--
 gst/mpegaudioparse/gstmpegaudioparse.c | 2 ++
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index b2b68c10f9..fdd0a949f5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-08-24  Jan Schmidt  <thaytan@mad.scientist.com>
+
+	* gst/dvdlpcmdec/gstdvdlpcmdec.c:
+	Add other allowed rates to the pad templates.
+
+	* gst/mpegaudioparse/gstmpegaudioparse.c: (gst_mp3parse_dispose):
+	Reset the parser to release memory in dispose.
+
 2007-08-17  Stefan Kost  <ensonic@users.sf.net>
 
 	* ext/amrnb/amrnbdec.c:
diff --git a/common b/common
index b3fe2a25c1..cd25ca736b 160000
--- a/common
+++ b/common
@@ -1 +1 @@
-Subproject commit b3fe2a25c1cd0f4b021795d0db7330aeb338da7c
+Subproject commit cd25ca736bc2446800de2180ad71fc1da858d324
diff --git a/gst/dvdlpcmdec/gstdvdlpcmdec.c b/gst/dvdlpcmdec/gstdvdlpcmdec.c
index aa0ce6f91f..97ad325507 100644
--- a/gst/dvdlpcmdec/gstdvdlpcmdec.c
+++ b/gst/dvdlpcmdec/gstdvdlpcmdec.c
@@ -44,7 +44,7 @@ static GstStaticPadTemplate gst_dvdlpcmdec_sink_template =
     GST_STATIC_CAPS ("audio/x-private1-lpcm; "
         "audio/x-lpcm, "
         "width = (int) { 16, 20, 24 }, "
-        "rate = (int) { 48000, 96000 }, "
+        "rate = (int) { 32000, 44100, 48000, 96000 }, "
         "channels = (int) [ 1, 8 ], "
         "dynamic_range = (int) [ 0, 255 ], "
         "emphasis = (boolean) { TRUE, FALSE }, "
@@ -57,7 +57,7 @@ GST_STATIC_PAD_TEMPLATE ("src",
     GST_PAD_ALWAYS,
     GST_STATIC_CAPS ("audio/x-raw-int, "
         "width = (int) { 16, 24 }, "
-        "rate = (int) { 48000, 96000 }, "
+        "rate = (int) { 32000, 44100, 48000, 96000 }, "
         "channels = (int) [ 1, 8 ], "
         "endianness = (int) { BIG_ENDIAN }, "
         "depth = (int) { 16, 24 }, " "signed = (boolean) { true }")
diff --git a/gst/mpegaudioparse/gstmpegaudioparse.c b/gst/mpegaudioparse/gstmpegaudioparse.c
index ca544f33e9..2b57ef832e 100644
--- a/gst/mpegaudioparse/gstmpegaudioparse.c
+++ b/gst/mpegaudioparse/gstmpegaudioparse.c
@@ -309,6 +309,8 @@ gst_mp3parse_dispose (GObject * object)
 {
   GstMPEGAudioParse *mp3parse = GST_MP3PARSE (object);
 
+  gst_mp3parse_reset (mp3parse);
+
   if (mp3parse->adapter) {
     g_object_unref (mp3parse->adapter);
     mp3parse->adapter = NULL;