fix compilation for mpv's config.h
Merge remote-tracking branch 'origin/master'
add libdvdnav dependency
revert some changes which should not be committed yet
revert some changes which should not be committed yet-continued