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-20 14:27:46 +0800
Browse Files
Options
Browse Files
Download
Plain Diff
Commit
49330b98b34de967a73d6d91f9536355344b2e5e
49330b98
2 parents
bb1331cc
797c1b07
Merge pull request #296 from panda1986/develop
支持mp3音频编码
隐藏空白字符变更
内嵌
并排对比
正在显示
1 个修改的文件
包含
0 行增加
和
6 行删除
trunk/src/app/srs_app_ffmpeg.cpp
trunk/src/app/srs_app_ffmpeg.cpp
查看文件 @
49330b9
...
...
@@ -181,12 +181,6 @@ int SrsFFMPEG::initialize_transcode(SrsConfDirective* engine)
}
if
(
acodec
!=
SRS_RTMP_ENCODER_COPY
&&
acodec
!=
SRS_RTMP_ENCODER_NO_AUDIO
)
{
if
(
acodec
.
find
(
SRS_RTMP_ENCODER_ACODEC
)
==
std
::
string
::
npos
)
{
ret
=
ERROR_ENCODER_ACODEC
;
srs_error
(
"invalid acodec, must be %s, actual %s, ret=%d"
,
SRS_RTMP_ENCODER_ACODEC
,
acodec
.
c_str
(),
ret
);
return
ret
;
}
if
(
abitrate
<=
0
)
{
ret
=
ERROR_ENCODER_ABITRATE
;
srs_error
(
"invalid abitrate: %d, ret=%d"
,
abitrate
,
ret
);
...
...
请
注册
或
登录
后发表评论