Merge pull request #5 from changer-z-xy/dev

关于我这边视频播放和主窗口的整合
Merge branch 'dev' of git://github.com/Liuchang0812/video-copy into dev