FFmpeg: Bump to version 2.3.2
[pvr] properly update the view mode when switching channels
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