winlin

merge from 2.0release

... ... @@ -32,7 +32,6 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define VERSION_MAJOR 3
#define VERSION_MINOR 0
#define VERSION_REVISION 0
#define VERSION_REVISION 143
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
... ...