Merge remote-tracking branch 'teamxbmc/master'
Merge branch 'master' of https://github.com/margro/xbmc
Merge branch 'master' of https://github.com/margro/xbmc
changed: Refactor CGUIMediaWindow::ShowShareErrorMessage() so it works with any path
dvdplayer: Allow multithread decoding for hi10p content by default

This allows decoding of some hi10p material on e.g. AMD Fusion with
both cores at the max. This introduces a new advancedsetting named
disablehi10pmultithreading to disable hi10p decoded multithreaded.
change AERingBuffer::Read to accept a NULL so we can drain without a dest
fixed CAESinkNULL
changed: Add rule for selecting remote (or non-local) items for player selection rules
drop the ringbuffer and just keep track of totals
reverse the logic in AddPackets to make it more obvious we accept only up to our maximum
Refactor CSimpleFileCache::WaitData, kill race conditions.
dvdplayer: set dts after successful seek, correct time offsets
dvdplayer: update player state with reference to dts and absolute time
[WIN32][AE] fixed: release audio stream when XBMC is idle. Changed hard coded value to a existing define.
Fix sometimes select plugin setting from context menu not works problem.
remove incorrect 'add source' entries
[arm] fixed, build under -mcpu=arm1176jzf-s -mfloat-abi=softfp
Remove duplicated line which is same with the one 4 lines above.
Merge pull request #2261 from ronie/fix-pr2217

remove incorrect 'add source' entries
Merge pull request #2202 from davilla/fix-nullsink

Fix nullsink