[vlc/f30] (2 commits) ...Clean patch