Merge pull request #4624 from FernetMenta/paplayer

paplayer: dvdplayercodec - check if seek is possible before trying to se...
Merge pull request #4626 from Voyager1/fix-trac15163

[fix] only check video playlist status to determine fullscreen playback
Merge pull request #4619 from fritsch/aefixes

ActiveAE: correct time of buffered samples by resample ratio
Merge pull request #4615 from bombizombi/master

Fix for OSD auto hide not working
Merge pull request #4601 from jmarshallnz/play_media_sort_order

[builtins] PlayMedia() should use a sort order appropriate for the items
Merge pull request #4616 from kit500/master

fix resume behavior for plugins with stack
Merge pull request #4614 from Montellese/upnp_player_logging

upnp: add some potentially useful logging to CUPnPPlayer::PlayFile()
[gui] fix incorrect parsing of relative <width> and <height> tags
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.
Revert "[osxsink] - properly set the ae device type based on either ca or heuristical criteria - fixes DisplayPort not detected as LPCM capable and maybe others"

This reverts commit dc87b59b349fca01cc8fda4e655978a229f4a791.
Revert "[osxsink/iossink] - don't block addpackets if ca didn't do the initial data pull - but timeout gracefully for signaling an error condition to the engine (use a timer for detecting a real timeout as condvar can be signaled by spurious interrupts)"

This reverts commit ecd891c4db757f190b2acbb6266e79db10b94dc0.