Merge branch 'maint'

The merge conflicted due to an integer overflow fix in com_jmp().

* maint:
  play: Fix some integer overflows().

diff --cc play.c
index 4adedcc0475a6a810513989499ab31b752d2a945,f28a324c30a2554a10de558b1fb0f3d2e5990e67..11a1cd3923ad26eb514106b83fd51bc3c1d6e42e
--- 1/play.c
--- 2/play.c
+++ b/play.c
@@@ -944,10 -952,10 +944,10 @@@ static int com_ff(struct lls_parse_resu
                return ret;
        if (pt->playing && !pt->fn.btrn)
                return 0;
 -      seconds += get_play_time();
 +      seconds += (get_play_time() + 500) / 1000;
        seconds = PARA_MIN(seconds, (typeof(seconds))pt->seconds - 4);
        seconds = PARA_MAX(seconds, 0);
-       pt->start_chunk = pt->num_chunks * seconds / pt->seconds;
+       pt->start_chunk = (uint64_t)pt->num_chunks * seconds / pt->seconds;
        pt->start_chunk = PARA_MIN(pt->start_chunk, pt->num_chunks - 1);
        pt->start_chunk = PARA_MAX(pt->start_chunk, 0UL);
        if (!pt->playing)