Toggle navigation
Toggle navigation
此项目
正在载入...
Sign in
胡斌
/
srs
转到一个项目
Toggle navigation
项目
群组
代码片段
帮助
Toggle navigation pinning
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Authored by
winlin
2015-01-17 13:04:52 +0800
Browse Files
Options
Browse Files
Download
Email Patches
Plain Diff
Commit
4449a8d7b093447444d05f545e9282ff04299f83
4449a8d7
1 parent
118efcbb
fix #290, use iformat only for rtmp input. 1.0.22
隐藏空白字符变更
内嵌
并排对比
正在显示
3 个修改的文件
包含
9 行增加
和
1 行删除
README.md
trunk/src/app/srs_app_ffmpeg.cpp
trunk/src/core/srs_core.hpp
README.md
查看文件 @
4449a8d
...
...
@@ -385,6 +385,7 @@ Supported operating systems and hardware:
## History
*
v1.0, 2015-01-17, hotfix
[
#290
](
https://github.com/winlinvip/simple-rtmp-server/issues/290
)
, use iformat only for rtmp input. 1.0.22
*
<strong>
v1.0, 2015-01-15,
[
1.0r1 release(1.0.21)
](
https://github.com/winlinvip/simple-rtmp-server/releases/tag/1.0r1
)
released. 59472 lines.
</strong>
*
v1.0, 2015-01-08, hotfix
[
#281
](
https://github.com/winlinvip/simple-rtmp-server/issues/281
)
, fix hls bug ignore type-9 send aud. 1.0.20
*
v1.0, 2015-01-03, hotfix to remove the pageUrl for http callback. 1.0.19
...
...
trunk/src/app/srs_app_ffmpeg.cpp
查看文件 @
4449a8d
...
...
@@ -209,6 +209,13 @@ int SrsFFMPEG::initialize_transcode(SrsConfDirective* engine)
return
ret
;
}
// for not rtmp input, donot append the iformat,
// for example, "-f flv" before "-i udp://192.168.1.252:2222"
// @see https://github.com/winlinvip/simple-rtmp-server/issues/290
if
(
input
.
find
(
"rtmp://"
)
!=
0
)
{
iformat
=
""
;
}
return
ret
;
}
...
...
trunk/src/core/srs_core.hpp
查看文件 @
4449a8d
...
...
@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
// current release version
#define VERSION_MAJOR 1
#define VERSION_MINOR 0
#define VERSION_REVISION 2
1
#define VERSION_REVISION 2
2
// server info.
#define RTMP_SIG_SRS_KEY "SRS"
#define RTMP_SIG_SRS_ROLE "origin/edge server"
...
...
请
注册
或
登录
后发表评论