Merge branch '2.0release' into develop

winlin
Commit 1c7d5f1852056b8aaa2d54b128617b828eb5727b 1c7d5f18 2 parents 9ead0872 353e3260
trunk/src/app/srs_app_utility.cpp
--- a/trunk/src/app/srs_app_utility.cpp
查看文件 @1c7d5f1
+++ b/trunk/src/app/srs_app_utility.cpp
查看文件 @1c7d5f1
@@ -163,11 +163,6 @@ string srs_path_build_timestamp(string template_path)
     // [2006], replace with current year.
     if (true) {
-        snprintf(buf, sizeof(buf), "%d", 1900 + tm->tm_year);
-        path = srs_string_replace(path, "[2006]", buf);
-    }
-    // [2006], replace with current year.
-    if (true) {
         snprintf(buf, sizeof(buf), "%04d", 1900 + tm->tm_year);
         path = srs_string_replace(path, "[2006]", buf);
     }