external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

for bug#241, simplify the buffer, donot change its size.

Browse source
This commit is contained in:
winlin 2014-12-04 15:43:37 +08:00
parent d026861e23
commit a23b5b9a4b
8 changed files with 17 additions and 44 deletions
Download patch file Download diff file Expand all files Collapse all files

4
trunk/src/app/srs_app_recv_thread.cpp
View file

@ -295,7 +295,7 @@ void SrsPublishRecvThread::on_thread_start()
// enable the merge read
// @see https://github.com/winlinvip/simple-rtmp-server/issues/241
rtmp->set_merge_read(true, nb_rbuf, this);
rtmp->set_merge_read(true, this);
#endif
}
@ -311,7 +311,7 @@ void SrsPublishRecvThread::on_thread_stop()
#ifdef SRS_PERF_MERGED_READ
// disable the merge read
// @see https://github.com/winlinvip/simple-rtmp-server/issues/241
rtmp->set_merge_read(false, 0, NULL);
rtmp->set_merge_read(false, NULL);
#endif
}