add modify
f
Merge branch 'master' of github.com:szqh97/test

Conflicts:
	build.sh
	gen_a_v.py
	tags
	video_split.cpp