From: Tim-Philipp Müller <tim@centricular.net>
Date: Thu, 24 May 2007 15:16:59 +0000 (+0000)
Subject: gst-libs/gst/riff/riff-media.c: Don't add channels and rate fields to the template... 
X-Git-Tag: 1.19.3~511^2~11129
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=57375cf664a046f9d8707183f5c31fdb95616588;p=platform%2Fupstream%2Fgstreamer.git

gst-libs/gst/riff/riff-media.c: Don't add channels and rate fields to the template caps for audio/x-dts, as wavparse ...

Original commit message from CVS:
* gst-libs/gst/riff/riff-media.c: (gst_riff_create_audio_caps):
Don't add channels and rate fields to the template caps for
audio/x-dts, as wavparse might not always be able to set them,
which would then lead to 'caps are not a real subset of the
template caps' warnings.
---

diff --git a/ChangeLog b/ChangeLog
index 3e0a26c..4c5db41 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2007-05-24  Tim-Philipp Müller  <tim at centricular dot net>
+
+	* gst-libs/gst/riff/riff-media.c: (gst_riff_create_audio_caps):
+	  Don't add channels and rate fields to the template caps for
+	  audio/x-dts, as wavparse might not always be able to set them,
+	  which would then lead to 'caps are not a real subset of the
+	  template caps' warnings.
+
 2007-05-24  Jan Schmidt  <thaytan@mad.scientist.com>
 
 	* gst/playback/gstplaybasebin.c: (new_decoded_pad_full):
diff --git a/gst-libs/gst/riff/riff-media.c b/gst-libs/gst/riff/riff-media.c
index 43cd39f..16bdae4 100644
--- a/gst-libs/gst/riff/riff-media.c
+++ b/gst-libs/gst/riff/riff-media.c
@@ -1000,6 +1000,8 @@ gst_riff_create_audio_caps (guint16 codec_id,
       caps = gst_caps_new_simple ("audio/x-dts", NULL);
       if (codec_name)
         *codec_name = g_strdup ("DTS audio");
+      /* wavparse is not always able to specify rate/channels for DTS-in-wav */
+      rate_chan = FALSE;
       break;
     case GST_RIFF_WAVE_FORMAT_AAC:
     {