[Confluence] labels in PVR Search could overlap
Merge pull request #6043 from ronie/helix-confluence-pvr-search

[Confluence] labels in PVR Search could overlap
vdpau: advanced settings for auto deinterlacing
ActiveAE: slightly reduce buffer size
pthreads: use mutex protocol PTHREAD_PRIO_INHERIT
vaapi: lock gfx context on pre-cleanup
Bump xbmc-pvr-addons ref