diff options
| author | David Schleef <ds@schleef.org> | 2003-06-10 06:32:59 +0000 |
|---|---|---|
| committer | David Schleef <ds@schleef.org> | 2003-06-10 06:32:59 +0000 |
| commit | b036fe4fda12649227a602dc8617dec1d9903e6e (patch) | |
| tree | 4b0c71ae8af551bbc46fe61e43b517894d941a62 /gst | |
| parent | 58e016642fbdc8d788a4ca20bcb472c2916795cd (diff) | |
fix: width is in bytes, not bits. Remove incorrect assertion.
Original commit message from CVS:
fix: width is in bytes, not bits. Remove incorrect assertion.
Diffstat (limited to 'gst')
| -rw-r--r-- | gst/audioconvert/gstaudioconvert.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gst/audioconvert/gstaudioconvert.c b/gst/audioconvert/gstaudioconvert.c index 6f7387d46..d5d4ae0dd 100644 --- a/gst/audioconvert/gstaudioconvert.c +++ b/gst/audioconvert/gstaudioconvert.c @@ -351,7 +351,7 @@ gst_audio_convert_link (GstPad *pad, GstCaps *caps) )) return GST_PAD_LINK_DELAYED; if (!gst_caps_get_int (caps, "endianness", &endianness)) { - if (width == 8) { + if (width == 1) { endianness = G_BYTE_ORDER; } else { return GST_PAD_LINK_DELAYED; @@ -397,7 +397,7 @@ gst_audio_convert_change_state (GstElement *element) static GstCaps* make_caps (gint endianness, gboolean sign, gint depth, gint width, gint rate, gint channels) { - if (width == 8) { + if (width == 1) { return GST_CAPS_NEW ( "audio_convert_caps", "audio/raw", @@ -437,7 +437,6 @@ gst_audio_convert_set_caps (GstPad *pad) this = GST_AUDIO_CONVERT (GST_PAD_PARENT (pad)); nr = this->src == pad ? 1 : this->sink == pad ? 0 : -1; g_assert (nr > -1); - g_assert (this->caps_set[1 - nr]); /* try 1:1 first */ caps = make_caps (this->endian[1 - nr], this->sign[1 - nr], this->depth[1 - nr], |