[vlc/f37] (3 commits) ...Workaround breaking api with dcp