Fading out on song change was not working, if UpMixing is selected
On some occasions the Upmixing flag was not honored and fadeoutr did not work
Merge branch 'master' of https://github.com/MediaPortal/MediaPortal-1 into BUG-4375-Music_FadeOut_on_song_change_not_working_with_Upmixing
Merge branch 'BUG-4375-Music_FadeOut_on_song_change_not_working_with_Upmixing'
Mantis #3935 : WIP Audio Channel Count for Internal Blu-ray.
Merge remote-tracking branch 'remotes/origin/FEAT-3935-Add_audio_channel_count_information_for_the_Blu-ray_audio_streams'
Merge remote-tracking branch 'remotes/upstream/master' into 1.4.0Fork_SEB

Conflicts:
	DirectShowFilters/BDReader/source/BDReader.cpp