VDPAU: improve error handling, Gotham
Merge pull request #4641 from FernetMenta/vdpau

VDPAU:  fixes freeze due to corrupted video stream, Gotham
Merge pull request #4655 from codesnake/allow_restart_of_a_pvr_addon_while_in_create

Allow restart of a PVR addon while it is still creating
Fix memory leak of CGUIViewState

Follow other examples, and use auto_ptr to make sure that the ViewState
object is freed when it goes out of scope

Coverity CID 1211800
Merge pull request #4649 from FernetMenta/vdpau3

VDPAU: fix segfault if vdpau fails to open context
Merge pull request #4647 from FernetMenta/vdpau2

VDPAU: fix cropping for interlaced frames
Merge pull request #3828 from janbar/epg_client_epguid

[pvr] Fix EPG hookdata: Return UniqueBroadcastID
Merge pull request #4653 from FernetMenta/paplayer

paplayer: fix mp4 playback
[rtmp] check m_rtmp for non-NULL - fixes crashes with missing librtmp
Merge pull request #4592 from koying/fixlinhotplug

FIX: [linux] fix & optimize input device checking
demuxer ffmpeg, workaround for broken probing of flac format
Merge pull request #4663 from FernetMenta/paplayer

demuxer ffmpeg, workaround for broken probing of flac format
FIX: [rtmp] do not hardlink librtmp
bump to Gotham 13.1 beta1
Merge pull request #4678 from koying/fixdroidrtmp

FIX: [rtmp] do not hardlink librtmp
[music] fix albumartist being used as a filter in song smartplaylists
Merge pull request #4680 from MartijnKaijser/13.1_b1

13.1 b1
Merge pull request #4664 from Montellese/broken_checks

fix broken comparisons
Conflicts:
	xbmc/settings/windows/GUIControlSettings.cpp