From 1de3e19fdbe8420a4e114f6c7196bad55c542231 Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Sat, 27 Nov 2004 20:22:42 +0000 Subject: [PATCH] ext/a52dec/gsta52dec.c: Don't do sample adjusting anymore, we use float audio now. Original commit message from CVS: * ext/a52dec/gsta52dec.c: (gst_a52dec_loop), (gst_a52dec_change_state): Don't do sample adjusting anymore, we use float audio now. * gst/audioconvert/gstaudioconvert.c: (gst_audio_convert_fixate): Don't fixate to non-existing properties. --- ChangeLog | 8 ++++++++ gst/audioconvert/gstaudioconvert.c | 6 ++++-- 2 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 27253a66c..16de5d8bf 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2004-11-27 Ronald S. Bultje + + * ext/a52dec/gsta52dec.c: (gst_a52dec_loop), + (gst_a52dec_change_state): + Don't do sample adjusting anymore, we use float audio now. + * gst/audioconvert/gstaudioconvert.c: (gst_audio_convert_fixate): + Don't fixate to non-existing properties. + 2004-11-27 Ronald S. Bultje * ext/a52dec/gsta52dec.c: (gst_a52dec_channels), diff --git a/gst/audioconvert/gstaudioconvert.c b/gst/audioconvert/gstaudioconvert.c index 557ce6a72..da07ce1ab 100644 --- a/gst/audioconvert/gstaudioconvert.c +++ b/gst/audioconvert/gstaudioconvert.c @@ -598,8 +598,10 @@ gst_audio_convert_fixate (GstPad * pad, const GstCaps * caps) } if (_fixate_caps_to_int (©, "width", try.width)) return copy; - if (_fixate_caps_to_int (©, "depth", try.depth)) - return copy; + if (gst_structure_get_name (gst_caps_get_structure (copy, 0))[12] == 'i') { + if (_fixate_caps_to_int (©, "depth", try.depth)) + return copy; + } if (_fixate_caps_to_int (©, "endianness", try.endianness)) return copy; if ((pos_val = gst_structure_get_value (gst_caps_get_structure (copy, 0), -- 2.34.1