[guilib] animation length was calculated incorrectly from effects with different delays
[guilib] drop unused AddEffect() function
Merge pull request #4580 from jmarshallnz/anim_length_fix

[guilib] animation length was calculated incorrectly from effects
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