Skip to content

Commit 0fe17c3

Browse files
committed
Merge #1077, fix crash for edge HLS. 2.0.247
1 parent fd016ed commit 0fe17c3

File tree

2 files changed

+3
-1
lines changed

2 files changed

+3
-1
lines changed

README.md

+2
Original file line numberDiff line numberDiff line change
@@ -332,6 +332,7 @@ Remark:
332332

333333
## History
334334

335+
* v2.0, 2018-02-28, Merge [#1077][bug #1077], fix crash for edge HLS. 2.0.247
335336
* v2.0, 2018-02-13, Fix [#1059][bug #1059], support vhost in stream parameters. 2.0.246
336337
* v2.0, 2018-01-07, Merge [#1045][bug #1045], fix [#1044][bug #1044], TCP connection alive detection. 2.0.245
337338
* v2.0, 2018-01-04, Merge [#1039][bug #1039], fix bug of init.d script.
@@ -1305,6 +1306,7 @@ Winlin
13051306
[bug #1044]: https://github.com/ossrs/srs/issues/1044
13061307
[bug #1045]: https://github.com/ossrs/srs/issues/1045
13071308
[bug #1059]: https://github.com/ossrs/srs/issues/1059
1309+
[bug #1077]: https://github.com/ossrs/srs/issues/1077
13081310
[bug #xxxxxxxxxx]: https://github.com/ossrs/srs/issues/xxxxxxxxxx
13091311

13101312
[exo #828]: https://github.com/google/ExoPlayer/pull/828

trunk/src/core/srs_core.hpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
3131
// current release version
3232
#define VERSION_MAJOR 2
3333
#define VERSION_MINOR 0
34-
#define VERSION_REVISION 246
34+
#define VERSION_REVISION 247
3535

3636
// generated by configure, only macros.
3737
#include <srs_auto_headers.hpp>

0 commit comments

Comments
 (0)