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
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.
Revert "[osxsink] - detect digital outputs based on device name and make capable passthrough devices "AE_DEVTYPE_IEC958" for showing the passthrough options in the gui - fixes missing passthrough options on some special audio setups"

This reverts commit 352d013f8dd7a43be490a2468fbcc7fd8ebd865f.
Revert "[AESink/ios] - fix drain - we need to output silence when no samples are left - else CA on iOS will repeat loop the last sample"

This reverts commit b1d9c64cc2dacc4e54ebe43af0a2cb64835931fc.