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