fix video
fix bug
Merge branch 'fixvideo' into dev