From 015e76cb3f3f634d5db4df59ffe13f4a851d2c1c Mon Sep 17 00:00:00 2001 From: RocFang Date: Mon, 1 Jan 2018 22:57:44 +0800 Subject: [PATCH 1/2] Update configure (#1033) allow user to add some specific flags. --- trunk/configure | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/trunk/configure b/trunk/configure index 425b9b0f1..eecba9cab 100755 --- a/trunk/configure +++ b/trunk/configure @@ -94,7 +94,7 @@ SrsGprof=""; SrsGprofLink=""; if [ $SRS_GPROF = YES ]; then SrsGprof=" -pg -lc_p # performance of gperf SrsGperf=""; SrsGperfLink=""; if [ $SRS_GPERF = YES ]; then SrsGperfLink=" -lpthread"; fi # the cxx flag generated. -CXXFLAGS="${CppStd}${WarnLevel}${GDBDebug}${LibraryCompile}${SrsGprof}" +CXXFLAGS="${CXXFLAGS} ${CppStd}${WarnLevel}${GDBDebug}${LibraryCompile}${SrsGprof}" if [ $SRS_GPERF = YES ]; then CXXFLAGS="${CXXFLAGS} -fno-builtin-malloc -fno-builtin-calloc -fno-builtin-realloc -fno-builtin-free"; fi cat << END > ${SRS_OBJS}/${SRS_MAKEFILE} GCC = gcc From b4260368324f3fe2052fe367ac0da3cd1d61d023 Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 1 Jan 2018 23:01:13 +0800 Subject: [PATCH 2/2] Merge #1033, allow user to add some specific flags. 2.0.244 --- README.md | 2 ++ trunk/src/core/srs_core.hpp | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 4f2fe5248..9229f92e6 100755 --- a/README.md +++ b/README.md @@ -332,6 +332,7 @@ Remark: ## History +* v2.0, 2018-01-01, Merge [#1033][bug #1033], allow user to add some specific flags. 2.0.244 * v2.0, 2017-06-10, [2.0 release2(2.0.243)][r2.0r2] released. 86670 lines. * v2.0, 2017-05-29, Merge [#899][bug #899] to fix [#893][bug #893], ts PES ext length. 2.0.243 * v2.0, 2017-05-01, Fix [#865][bug #865], shouldn't remove ts/m3u8 when hls_dispose disabled. 2.0.242 @@ -1296,6 +1297,7 @@ Winlin [bug #865]: https://github.com/ossrs/srs/issues/865 [bug #893]: https://github.com/ossrs/srs/issues/893 [bug #899]: https://github.com/ossrs/srs/issues/899 +[bug #1033]: https://github.com/ossrs/srs/issues/1033 [bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx [exo #828]: https://github.com/google/ExoPlayer/pull/828 diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 2b6f31fbb..04d0bf928 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // current release version #define VERSION_MAJOR 2 #define VERSION_MINOR 0 -#define VERSION_REVISION 243 +#define VERSION_REVISION 244 // generated by configure, only macros. #include