[musicdb] fix incorrect use of ComputeCRC, causing playcounts to not update. Thanks to amet
Merge pull request #4590 from tamland/nav-sound-fix

Fix: navigation sounds from user config directory are never loaded
Merge pull request #4598 from jmarshallnz/plugins_run_as_plugins

[plugins] ensure we lookup the add-on as a plugin before trying any other extension point
Merge pull request #4576 from koying/fixamcart

FIX: [mediacodec] ART is not happy with non-existent values in map
Merge pull request #4587 from fritsch/xbmc-upstream

AlarmClock: Show correct string for shutdown timer
Merge pull request #4589 from FernetMenta/aefixes

ActiveAE: fix idling of engine due to high number of samples in sink buf...
Merge pull request #4593 from FernetMenta/dxva

dxva-hd: fix past/future frames and a/v sync
Merge pull request #4581 from FernetMenta/epg

pvr: fix duplicate EPG IDs if EPG is not stored in database
Merge pull request #4583 from fritsch/xbmc-upstream

ffmpeg: Backport c94305ae23318c8956a30485cd5642829f4f16a9 to fix #15085
Merge pull request #4580 from jmarshallnz/anim_length_fix

[guilib] animation length was calculated incorrectly from effects
Merge pull request #4579 from jmarshallnz/display_path_to_delete

when deleting files, make sure we display the path
Merge pull request #4572 from arnova/rar_subs

fixed: Downloading subs for rars was broken
Merge pull request #4591 from amet/subs_fixes

Subs search fixes
Merge pull request #4575 from koying/fixdroidcolor

FIX: [droid] missing color in labels
[musicdb] joins against album and song artist views should be LEFT, as some songs/albums have no artist. fixes #15149
[gui] don't show the 'remote path not found' message on directory failure unless it's a share. closes #15091, #15133.
h264_parser: Initialize the h264dsp context in the parser as well

Each AVStream struct for an H.264 elementary stream actually has two
copies of the H264DSPContext struct (and in fact all the other members
of H264Context as well):

((H264Context *) ((AVStream *)st)->codec->priv_data)->h264dsp
((H264Context *) ((AVStream *)st)->parser->priv_data)->h264dsp

but only the first of these was actually being initialised. This
prevented the addition of platform-specific implementations of
parser-related functions.

Signed-off-by: Martin Storsjö <martin@martin.st>
h264dsp: Factorize code into a new function, h264_find_start_code_candidate

This performs the start code search which was previously part of
h264_find_frame_end() - the most CPU intensive part of the function.

By itself, this results in a performance regression:
              Before          After
              Mean   StdDev   Mean   StdDev  Change
Overall time  2925.6 26.2     3068.5 31.7    -4.7%

but this can more than be made up for by platform-optimised
implementations of the function.

Signed-off-by: Martin Storsjö <martin@martin.st>
arm: Add assembly version of h264_find_start_code_candidate

               Before          After
               Mean   StdDev   Mean   StdDev  Change
This function   508.8 23.4      185.4  9.0    +174.4%
Overall        3068.5 31.7     2752.1 29.4     +11.5%

In combination with the preceding patch:
                Before          After
                Mean   StdDev   Mean   StdDev  Change
Overall         2925.6 26.2     2752.1 29.4     +6.3%

Signed-off-by: Martin Storsjö <martin@martin.st>
[ffmpeg] Backport of h264_find_start_code_candidate optimisation