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
Revert "[osx] fix make build on osx"

This reverts commit e0e327c6af51be32ded1b250d585b299efece816.
Revert "[osxsink] - fix bad access when device announces more then 8 channels - fixes #15065"

This reverts commit b7509ea8dc3c003825b33719cbc2445093b1145f.
Revert "[ios] - remove the audiosession handling from the sink - its handled in the UIApplication already"

This reverts commit 69db028a62c700f957f6afd16ea0081124b8380f.
Partially revert changes to AESinkDARWINIOS.* from "AESink: Revisit volume part 2"
Revert "[osxsink] - for devices which report samplerate 0hz - allow user override with 44.1khz and 48khz" (pull request #4467)

This reverts commit e2cff35c794a7b7a6be6d22eb56ca8c45eda5665.
Revert "[darwinsink] - increase the initial startup timeout of the sinks to 4500ms and log error case" (pull request #4471)

This reverts commit 714e7f2c0d81371c02945ef80549a65f289fe4b7.
Revert "[osxsink] - always fetch the defaultdevice from osx instead of or (maybe"

This reverts commit 753e70826c7d28ab827843afcd96aa6dc31ff0d8.
Revert "[osxsink/iossink] - don't spam the log with audiobuffer underruns with 0 bytes available - those underruns happen alot when we idle but sink isn't suspended yet - instead only log those underruns once until there was some data played again"

This reverts commit 943845f5a9005b737532178d562b39058d1da542.
Revert "[iossink/osxsink] - fixed - condvar has to wait on the mutex - not on the singlelock"

This reverts commit dc701c06c265b8a295cb5bba99b6d9fbf82ef215.
Revert "[iossink/osxsink] - don't deadloop in drain when device is gone - but"

This reverts commit c7b5c584a55e93cc810cb90060e92affb512324f.