dvdplayer: get number of channels for active audio stream from audio player, ffmpeg demuxer does not update this info for codecs like AAC
FFmpeg: Bump to version 2.3.2
[pvr] properly update the view mode when switching channels
Fixed default sorting for tv show years
Merge pull request #5206 from fritsch/ffmpeg-2.3.2

FFmpeg: Bump to version 2.3.2
Rename isDVDImage() to isDiscImage().

Conflicts:
	xbmc/video/windows/GUIWindowVideoBase.cpp
[win32] rename and generalise packaging folders. also simplify NSIS installer to match package folders
Merge pull request #5067 from Jalle19/fix-channel-view-mode

[pvr] properly update the view mode when switching channels
Consistent naming of Samba/CIFS related files.
Don't break strict aliasing rules.
[airplay] - fixed some warnings
[airplay] - fixed video/photo airplay after 6c3a7b626628dde068147a5d124a5897f1430744
Merge pull request #3716 from bfg1981/cleanup

Cleanup
Merge pull request #5225 from Black09/database-sorting

Fixed default sorting for tv show years
Merge pull request #5079 from FernetMenta/channels

dvdplayer: fix incorrect display of audio channels
Stub files: Added possibility to set a shortcut to a external file