test
Merge branches 'sky0921' and 'sky0921' of github.com:JRuiChen/x264_svc_new into sky0921
Merge branch 'sky0921' of github.com:JRuiChen/x264_svc_new into sky0921
sky0925test
merging 0925