external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-15 04:42:04 +00:00
Code Issues Releases Wiki Activity

Merge branch '2.0release' into develop

Browse source
This commit is contained in:
winlin 2017-02-25 11:21:56 +08:00
commit d786d61685
2 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
trunk/conf/origin.conf
View file

@ -6,5 +6,6 @@ listen 19350;
max_connections 1000; max_connections 1000;
daemon off; daemon off;
srs_log_tank console; srs_log_tank console;
pid ./objs/origin.pid;
vhost __defaultVhost__ { vhost __defaultVhost__ {
} }

1
trunk/src/app/srs_app_source.cpp
View file

@ -2296,7 +2296,6 @@ int SrsSource::on_video(SrsCommonMessage* shared_video)
if (!m) { if (!m) {
return ret; return ret;
} }
SrsAutoFree(SrsSharedPtrMessage, m);
// consume the monotonically increase message. // consume the monotonically increase message.
if (m->is_audio()) { if (m->is_audio()) {