[mpv/f24] (2 commits) ...Fix rfbz#3853