FIX: [mediacodec] ART is not happy with non-existent values in map
pvr: fix duplicate EPG IDs if EPG is not stored in database
ff_id3v2_free_extra_meta: set the pointer pointing to extra_meta to NULL

Fixes ticket #3530.

Signed-off-by: Peter Ross <pross@xvid.org>
Signed-off-by: Michael Niedermayer <michaelni@gmx.at>
FFmpeg: Cherry-pick c94305ae23318c8956a30485cd5642829f4f16a9 to fix #15085
Merge pull request #4583 from fritsch/xbmc-upstream

ffmpeg: Backport c94305ae23318c8956a30485cd5642829f4f16a9 to fix #15085
Merge pull request #4581 from FernetMenta/epg

pvr: fix duplicate EPG IDs if EPG is not stored in database
AlarmClock: xbmc.powerdown does not exist anymore
ActiveAE: fix idling of engine due to high number of samples in sink buffers
[coreSubs] focus subtitle list if subs are found
[coreSubs] allow search on same service
ActiveAE: add missing lock to GetWaterLevel
Merge pull request #4591 from amet/subs_fixes

Subs search fixes
load navigation sounds from user config directory
dxva-hd: fix past/future frames and a/v sync
renderer: fix queue size for DXVA-HD
Merge pull request #4593 from FernetMenta/dxva

dxva-hd: fix past/future frames and a/v sync
[plugins] ensure we lookup the add-on as a plugin before trying any extension point when fetching a plugin:// directory
Merge pull request #4589 from FernetMenta/aefixes

ActiveAE: fix idling of engine due to high number of samples in sink buf...
Merge pull request #4587 from fritsch/xbmc-upstream

AlarmClock: Show correct string for shutdown timer
Merge pull request #4576 from koying/fixamcart

FIX: [mediacodec] ART is not happy with non-existent values in map