[vlc/f39] (2 commits) ...Drop merged patch