fix ffmpeg bug
Merge branch 'master' of https://github.com/FoOTOo/NUEDC-2014-HIT
paper:实现原理-server
Merge branch 'master' of https://github.com/FoOTOo/NUEDC-2014-HIT