[osx/windowing] - ensure that the onresetdevice callback is called whenever a
lostdevice callback was called before. Do this by adding a timer (similar like done on x11). Also
handle "flags == 0" as devicereset (on some strange constellations we are
called with flags 0 instead of proper flags - this is undocumented but
it happens...).
AE: fix CAEChannelInfo::ResolveChannels, it returned duplicate channels in the list
XBMCTinyXML::TryParse: fix processing xml files with incorrect suggested encoding or incorrect encoding in xml declaration
Scraper & ScraperUrl: all internal XMLs are UTF-8, don't try any other encoding
Merge pull request #4418 from Karlson2k/fix_xml_enc

[scrapers] Fix processing xml files with incorrect suggested encoding or incorrect encoding in xml declaration
VDA decoder fix: add pts to picture buffer
[Fix] use av_free to free m_convertBuffer

::free may crash on memory allocated by av_malloc.
[osxsink] - for devices which report samplerate 0hz - allow user override
with 44.1khz and 48khz
Merge pull request #4440 from Montellese/settings_fixes

Two fixes in the settings system
Merge pull request #4450 from ndogxj/patch-1

[Fix] use av_free to free m_convertBuffer
Merge pull request #4408 from koying/fixamcexynos

FIX: [amc] add omx.exynos to white list
Merge pull request #4438 from fritsch/xbmc-upstream

AESinkDirectSound: Only add AC3 and DTS if we are not PCM device
Merge pull request #4427 from bkuhls/uclibc

[uClibc] Fix TZ after bfc296b
Merge pull request #4432 from FernetMenta/paplayer

paplayer: fix display of bits per sample for dvdplayer codecs
Merge pull request #4362 from popcornmix/avoid_pictures

[players] Skip picture attachments in video players
Merge pull request #4449 from FernetMenta/vda

VDA decoder fix: add pts to picture buffer
Merge pull request #4443 from at-visions/GothamAlsaRecover

Added error recovery if snd_pcm_writei fails
Merge pull request #4434 from margro/gotham_vfs_crash

[Gotham] Crash fix: Add check for negative file length.
correct ID for PVR settings description

Looks like the description I put in for string 36201 should actually be for 36202.
make musicvideo tracknumber available to skins