extra/x264: remove unneeded lines
extra/vlc: finish bringing in changes