[nfs] - change splitUrlIntoExportAndPath so that it can be used with external exportlist - preparation for adding a unit test
videolibrary: move logic for tvshow/season flattening from filesystem to GUI (fixes #14723)
AE: fix hidden setting stereo upmix if spdif is selected
AE: allow channel BC to be mixed into BL/BR os SL/SR
ActiveAE: let sink do channel mapping for 7.1
AESinkAlsa: Use 51Wide and 71Wide Maps when we need to do so
ActiveAE: limit buffertime to 80ms
ActiveAE: fix incorrect return values of GetSpace
WASAPI: try other channels layouts on init if requested one is not supported
WASAPI: handle obsolete 7.1 wide layout
Merge pull request #3744 from FernetMenta/aefixes

Aefixes
[nfs] - add unit tests for verifying proper splitting of nfs urls into export and relative path
Merge pull request #3776 from Memphiz/nfsunittest

[tests] - add unit test for nfs
[backport] fixed ffmpeg not keep custom http headers when playing hls stream
ffmpeg: add patch for backport: fixed not keeping custom http headers
Merge pull request #3618 from siriuzwhite/avformat-hls-fix

fixed bug where ffmpeg doesn't keep custom http headers when playing hls stream
Merge pull request #3777 from Montellese/season_listing_fix

videolibrary: move logic for tvshow/season flattening from filesystem to GUI (fixes #14723)
Merge remote-tracking branch 'upstream/master'