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

Merge branch 'develop' of github.com:winlinvip/simple-rtmp-server into develop

Browse source
This commit is contained in:
winlin 2015-01-20 18:33:48 +08:00
commit 664c85cf3d
1 changed files with 0 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

6
trunk/src/app/srs_app_ffmpeg.cpp
View file

@ -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);