With apologies to anyone still using cvs for speex development. (cherry picked from speex commit fe47ce7a423155b58a74582e488a506b562dae6f)