update master

wenjiegit
Commit 54bd613cf550d3925f914be923f40aa7fb1ec7a3 54bd613c 1 parent d05f69b2
trunk/research/ffempty/Makefile
trunk/research/ffempty/ffempty.cc
trunk/research/hls/Makefile
trunk/research/hls/ts_info.cc
trunk/research/players/img/tooltip.png
trunk/research/players/js/AdobeFlashPlayerInstall.swf
trunk/research/players/js/StrobeMediaPlayback.swf
trunk/research/players/js/bootstrap.min.js
trunk/research/players/js/jquery-1.10.2.min.js
trunk/research/players/js/jquery-1.10.2.min.map
trunk/research/players/js/json2.js
trunk/research/players/js/jwplayer.flash.swf
trunk/research/players/js/jwplayer.html5.js
trunk/research/players/js/jwplayer.js
trunk/research/players/js/srs.bandwidth.js
trunk/research/players/js/srs.js
trunk/research/players/js/srs.log.js
trunk/research/players/js/srs.page.js
trunk/research/players/js/srs.player.js
trunk/research/players/js/srs.publisher.js
--- a/trunk/research/ffempty/Makefile 100755 → 100644
查看文件 @54bd613
+++ b/trunk/research/ffempty/Makefile 100755 → 100644
查看文件 @54bd613
--- a/trunk/research/ffempty/ffempty.cc 100755 → 100644
查看文件 @54bd613
+++ b/trunk/research/ffempty/ffempty.cc 100755 → 100644
查看文件 @54bd613
--- a/trunk/research/hls/Makefile 100755 → 100644
查看文件 @54bd613
+++ b/trunk/research/hls/Makefile 100755 → 100644
查看文件 @54bd613
--- a/trunk/research/hls/ts_info.cc 100755 → 100644
查看文件 @54bd613
+++ b/trunk/research/hls/ts_info.cc 100755 → 100644
查看文件 @54bd613
--- a/trunk/research/players/img/tooltip.png 100755 → 100644
查看文件 @54bd613
+++ b/trunk/research/players/img/tooltip.png 100755 → 100644
查看文件 @54bd613
--- a/trunk/research/players/js/AdobeFlashPlayerInstall.swf 100755 → 100644
查看文件 @54bd613
+++ b/trunk/research/players/js/AdobeFlashPlayerInstall.swf 100755 → 100644
查看文件 @54bd613
--- a/trunk/research/players/js/StrobeMediaPlayback.swf 100755 → 100644
查看文件 @54bd613
+++ b/trunk/research/players/js/StrobeMediaPlayback.swf 100755 → 100644
查看文件 @54bd613
--- a/trunk/research/players/js/bootstrap.min.js 100755 → 100644
查看文件 @54bd613
+++ b/trunk/research/players/js/bootstrap.min.js 100755 → 100644
查看文件 @54bd613
--- a/trunk/research/players/js/jquery-1.10.2.min.js 100755 → 100644
查看文件 @54bd613
+++ b/trunk/research/players/js/jquery-1.10.2.min.js 100755 → 100644
查看文件 @54bd613
--- a/trunk/research/players/js/jquery-1.10.2.min.map 100755 → 100644
查看文件 @54bd613
+++ b/trunk/research/players/js/jquery-1.10.2.min.map 100755 → 100644
查看文件 @54bd613
--- a/trunk/research/players/js/json2.js 100755 → 100644
查看文件 @54bd613
+++ b/trunk/research/players/js/json2.js 100755 → 100644
查看文件 @54bd613
--- a/trunk/research/players/js/jwplayer.flash.swf 100755 → 100644
查看文件 @54bd613
+++ b/trunk/research/players/js/jwplayer.flash.swf 100755 → 100644
查看文件 @54bd613
--- a/trunk/research/players/js/jwplayer.html5.js 100755 → 100644
查看文件 @54bd613
+++ b/trunk/research/players/js/jwplayer.html5.js 100755 → 100644
查看文件 @54bd613
--- a/trunk/research/players/js/jwplayer.js 100755 → 100644
查看文件 @54bd613
+++ b/trunk/research/players/js/jwplayer.js 100755 → 100644
查看文件 @54bd613
--- a/trunk/research/players/js/srs.bandwidth.js 100755 → 100644
查看文件 @54bd613
+++ b/trunk/research/players/js/srs.bandwidth.js 100755 → 100644
查看文件 @54bd613
--- a/trunk/research/players/js/srs.js 100755 → 100644
查看文件 @54bd613
+++ b/trunk/research/players/js/srs.js 100755 → 100644
查看文件 @54bd613
--- a/trunk/research/players/js/srs.log.js 100755 → 100644
查看文件 @54bd613
+++ b/trunk/research/players/js/srs.log.js 100755 → 100644
查看文件 @54bd613
--- a/trunk/research/players/js/srs.page.js 100755 → 100644
查看文件 @54bd613
+++ b/trunk/research/players/js/srs.page.js 100755 → 100644
查看文件 @54bd613
--- a/trunk/research/players/js/srs.player.js 100755 → 100644
查看文件 @54bd613
+++ b/trunk/research/players/js/srs.player.js 100755 → 100644
查看文件 @54bd613
--- a/trunk/research/players/js/srs.publisher.js 100755 → 100644
查看文件 @54bd613
+++ b/trunk/research/players/js/srs.publisher.js 100755 → 100644
查看文件 @54bd613
--- a/trunk/research/players/js/srs.utility.js 100755 → 100644
查看文件 @54bd613
+++ b/trunk/research/players/js/srs.utility.js 100755 → 100644
查看文件 @54bd613
--- a/trunk/research/players/js/swfobject.js 100755 → 100644
查看文件 @54bd613
+++ b/trunk/research/players/js/swfobject.js 100755 → 100644
查看文件 @54bd613