Merge branch '2.0release' into develop

2015-03-23 21:21:42 +08:00 · 2015-03-23 21:21:42 +08:00 · df3f24403e
commit df3f24403e
parent bfa46e7a98 02addf61f7
1 changed files with 1 additions and 1 deletions
--- a/trunk/src/libs/srs_librtmp.cpp
+++ b/trunk/src/libs/srs_librtmp.cpp
@ -2340,7 +2340,7 @@ int srs_human_print_rtmp_packet(char type, u_int32_t timestamp, char* data, int
 const char* srs_human_format_time()
 {
    struct timeval tv;
-    char buf[23];
+    static char buf[23];
    
    memset(buf, 0, sizeof(buf));