Added support of VLC 2.2.x and 3.0.x