cosmetics - remove unused variable
cosmetics - remove unused code
upnp: fix inconsistent / at end of folders
upnp: fix reported parents of irregular paths
[WebServer] Simplify file existence check
[fix] string copy allocated in function params can be destroyed before access via *end pointer causing EXC_BAD_ACCESS
Merge pull request #2984 from whaupt/xbmc/ofc/master

[WebServer] Simplify file existence check
[fix] ffmpeg uses a 16-byte stride when scaling images, which can overrun the texture buffer which is only 2-byte aligned, causing a segfault on OSX/iOS
Merge pull request #2991 from night199uk/misc

[fixes] Fix a couple of EXC_BAD_ACCESS memory access bugs on OSX that cause real instability
use correct setting description for weather settings
quell compiler warning if compiling without libva, vdpau or darwin
Merge pull request #2829 from alcoheca/shoddy_parenting

Shoddy parenting
Update AMLPlayer.cpp

Proper fixed as suggested by davilla and  Arne
Merge pull request #2997 from mvdroest/patch-2

Update AMLPlayer.cpp