external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-02-13 03:41:55 +00:00
Code Issues Releases Wiki Activity

Merge branch 'srs.master'

Browse source
This commit is contained in:
winlin 2014-11-21 14:30:29 +08:00
commit 5c8c40f4ee
2 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
trunk/research/librtmp/srs_bandwidth_check.c
View file

@ -21,7 +21,7 @@ IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*/ */
/** /**
gcc srs_rtmp_bandwidth_check.c ../../objs/lib/srs_librtmp.a -g -O0 -lstdc++ -o srs_rtmp_bandwidth_check gcc srs_bandwidth_check.c ../../objs/lib/srs_librtmp.a -g -O0 -lstdc++ -o srs_bandwidth_check
*/ */
#include <stdio.h> #include <stdio.h>

2
trunk/src/srs/srs.upp
View file

@ -129,7 +129,7 @@ file
..\utest\srs_utest_reload.cpp, ..\utest\srs_utest_reload.cpp,
research readonly separator, research readonly separator,
..\..\research\librtmp\srs_audio_raw_publish.c, ..\..\research\librtmp\srs_audio_raw_publish.c,
..\..\research\librtmp\srs_rtmp_bandwidth_check.c, ..\..\research\librtmp\srs_bandwidth_check.c,
..\..\research\librtmp\srs_detect_rtmp.c, ..\..\research\librtmp\srs_detect_rtmp.c,
..\..\research\librtmp\srs_flv_injecter.c, ..\..\research\librtmp\srs_flv_injecter.c,
..\..\research\librtmp\srs_flv_parser.c, ..\..\research\librtmp\srs_flv_parser.c,