winlin

Merge pull request #296 from panda1986/develop

支持mp3音频编码
@@ -181,12 +181,6 @@ int SrsFFMPEG::initialize_transcode(SrsConfDirective* engine) @@ -181,12 +181,6 @@ int SrsFFMPEG::initialize_transcode(SrsConfDirective* engine)
181 } 181 }
182 182
183 if (acodec != SRS_RTMP_ENCODER_COPY && acodec != SRS_RTMP_ENCODER_NO_AUDIO) { 183 if (acodec != SRS_RTMP_ENCODER_COPY && acodec != SRS_RTMP_ENCODER_NO_AUDIO) {
184 - if (acodec.find(SRS_RTMP_ENCODER_ACODEC) == std::string::npos) {  
185 - ret = ERROR_ENCODER_ACODEC;  
186 - srs_error("invalid acodec, must be %s, actual %s, ret=%d",  
187 - SRS_RTMP_ENCODER_ACODEC, acodec.c_str(), ret);  
188 - return ret;  
189 - }  
190 if (abitrate <= 0) { 184 if (abitrate <= 0) {
191 ret = ERROR_ENCODER_ABITRATE; 185 ret = ERROR_ENCODER_ABITRATE;
192 srs_error("invalid abitrate: %d, ret=%d", abitrate, ret); 186 srs_error("invalid abitrate: %d, ret=%d", abitrate, ret);