merge from allspace srs-librtmp for win vs2010. 2.0.36
merge from master. 3.0.36