[vlc/f29] (2 commits) ...Fix build with x264 >= 0.153