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] drop outputbuffer index and iterate over them all"

This reverts commit b9a1d07a7d1a2bec3bb094b97cc7d96a325b9b98.

Conflicts:
	xbmc/cores/AudioEngine/Sinks/AESinkDARWINOSX.cpp
[darwinsink] - use fixed outputbuffer with idx 0