fixed more softAE borks from merge
[aml] fixed, alsa/kernel lies, so map everything to 44100 or 48000
[aml] fixed, expand video rate exception to include more '30fps' content
Merge remote-tracking branch 'upstream/master'

Conflicts:
	xbmc/cores/AudioEngine/Engines/SoftAE/SoftAE.cpp