URIUtils: fix out of range exception in resolvePath()
Merge pull request #4277 from xhaggi/fix-recordings-parent-dir

[pvr] fix: duplicate parent dir item for recordings
[language] fix typo
[language] fix inconsistent naming of Blu-ray and improve wording of related labels
Merge pull request #4326 from da-anda/label-fixes

[language] fix inconsistent naming of Blu-ray and improve wording of related labels
FIX: set logger to NULL when the XBMC::Context is deleted
[DROID][JNI] Add method to query HW sample rate.
[DROID][AE] Don't guess at supported sampling rate

Android will resample to the "native" sample rate defined in firmware so
only use that rate.
[Confluence] fix usage of "next" label in mismatching contexts, which caused trouble in translations
Merge pull request #4327 from da-anda/confluence-labels

[Confluence] fix usage of "next" label in mismatching contexts
mysql: replace all "cast(foo as integer)" to "cast(foo as signed integer)" and not just the first one
use FF_LEVEL_UNKNOWN by default (prevents some common mismatches in
ParsePacket which triggers reopening of streams)
Merge pull request #4329 from t-nelson/droid_native_sr

Droid native sr
Do not allow non-content stream types to extend the format context's duration as this
affects the UI and therefore seek capabilities.

DVB subtitle/teletext streams are private streams (stream type 0xBD) and may have their
own timebase or PTS values that are widely different than video stream's,
or not set properly. Regardless of any handling of such cases in FFmpeg, XBMC shouldn't
extend play duration unless an actual content stream has passed it's "end".
Merge pull request #4321 from Montellese/uriutils_resolvepath_fix

URIUtils: fix out of range exception in resolvePath()
[win32/libnfs] - downgrade to 1.3.0 because of issues with 1.6 on windows
(not able to reproduce - not able to fix)
AE: only display setting for EAC3 if sink supports it
Merge pull request #4341 from FernetMenta/eac3

AE: only display setting for EAC3 if sink supports it
[osxsink/iossink] - don't block addpackets if ca didn't do the initial data pull - but timeout gracefully for signaling an error condition to the engine (use a timer for detecting a real timeout as condvar can be signaled by spurious interrupts)
[osxsink] - properly set the ae device type based on either ca or heuristical criteria - fixes DisplayPort not detected as LPCM capable and maybe others