Merge remote-tracking branch 'origin/delete_test'
Merge branch 'master' of github.com:guitilangyin0000/mplayer