Correct handling of multimedia key presses
Fix for incorrectly using clamped resolution when looking for framerate match
Revert "[epg] fixed - epg load/update was interrupted when the pvr manager imports channels, leading to delays and channel ids gone missing in certain situations"

This reverts commit bdf8842d543fae54067c4dd453bded8474e1044f.
Merge branch 'pvr-epg-startup' into xbmc-staging
Merge branch 'icon-scan-bg' into xbmc-staging
Merge branch 'epg-log' into xbmc-staging
Merge pull request #2039 from jhsrennie/master

Correct handling of multimedia keypresses
[cddb] use uint32_t for the disc id rather than unsigned long and other permutations - it has to be 32 bits. fixes #13933.
don't append null-terminator to buffer. fixes #13545
write id3v2 tags when ripping cds to mp3
Merge pull request #2052 from jmarshallnz/cddb64

[cddb] use uint32_t for the disc id rather than unsigned long
[jpegio] use chunked reading in case the filesize isn't available on Open()
Merge pull request #1885 from jmarshallnz/chunky_jpegs

[jpegio] Use chunked reading if CFile::Open doesn't set CFile::GetFileSize
Merge pull request #2020 from jmarshallnz/lame_id3_v2

Always write v2 ID3 tags when ripping to mp3
[cec] don't send incorrect pause/resume to slideshow when the source is (de)activated and don't resume playback when the source is activated and we didn't pause it when the source was deactivated
[cec] don't update the device type in settings with the value that was returned from libCEC
If cached art from Eden exists, but no original url is available, map it to an unknown http address so that the art is maintained in Frodo. Required as themoviedb.org scraper caused actor art to be this way in Eden.
Issue #13810: This should fix the DELETE statement for MySQL (UNTESTED!).

MySQL does not allow for SubSelects on the table you are updating or deleting from. So we have to use a statement with joins instead. Unfortunatly DeleteValues does not support the needed syntax, so we just execute the plain query.
[rbp] Fix for timestamp problems commonly seen with avi files.
[jpegio] clarify and comment the reading code and handle the case of an expanding file.