[confluence] update positioning so that <right> is measured from the right
fixup! renderer: calculate source rect on upload GLES:EGL/CVRef/MediaCodec
renderer: factor out logic for upgrading GL format to 16bit
fixup! renderer: add underlying support for 16bit textures on gles
Merge pull request #3755 from fritsch/revert-6d637d

Revert "Ensure that the decoder is init once only."
[pvr] CFileItem: fallback to channel icon if epg icon is empty
Merge pull request #3669 from jmarshallnz/right_means_right

Control positioning: Make <right>, <bottom> measure from right and bottom
mpegts: do not set pts for missing dts in video streams

Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
ffmpeg: add patch for backport: mpegts-do-not-set-pts-for-missing-dts
Merge pull request #3702 from elmerfud/master

fix for #14713: RSSDirectory Reading of Boxee Genre Incorrect
Merge pull request #3763 from xhaggi/fileitem-epginfotag-icon

[pvr] CFileItem: fallback to channel icon if epg icon is empty
Merge pull request #3684 from Jalle19/pvr-small-fixes

Cleanup some of the PVR code
Merge pull request #3733 from xhaggi/fix-epg-progress-indicator

[epg] fix: hide progress indicator if go forward in time
[pvr] support for past epg data in timeline view
[epg] fix: incorrect return value in GetSelectedItem()
[fix] Could not edit/assign movie to movie set after #3642
due to https://github.com/Montellese/xbmc/commit/e14fae38dec48cd1cd36f875f1ebde5396f43d57
Merge pull request #3767 from Voyager1/fixmovieset

[fix] Could not edit/assign movie to movie set after #3642
[ios/atv2] - readd gitrev-posix which was wrongly removed in 05274bfcbcbbc96a5ee5a61bf4018b30719727f4 - its still needed in ios/atv2 packaging if we want to retain dsym files (on jenkins...)
Add missing includes of "system.h", fixes #14732
Merge pull request #3754 from popcornmix/fix_viewport_cache

[GLES] Fix for SBS rendering and cached viewport