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

donot check the aac encoder, ensure aac is ok

Browse source
This commit is contained in:
winlin 2014-04-05 15:01:41 +08:00
parent 7de8bd7595
commit 7916cab50e
2 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

4
trunk/src/app/srs_app_encoder.cpp
View file

@ -45,7 +45,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#define SRS_ENCODER_NO_VIDEO "vn"
#define SRS_ENCODER_NO_AUDIO "an"
#define SRS_ENCODER_VCODEC "libx264"
#define SRS_ENCODER_ACODEC "libaacplus"
#define SRS_ENCODER_ACODEC "aac"
// for encoder to detect the dead loop
static std::vector<std::string> _transcoded_url;
@ -191,7 +191,7 @@ int SrsFFMPEG::initialize(SrsRequest* req, SrsConfDirective* engine)
}
if (acodec != SRS_ENCODER_COPY && acodec != SRS_ENCODER_NO_AUDIO) {
if (acodec != SRS_ENCODER_ACODEC) {
if (acodec.find(SRS_ENCODER_ACODEC) == std::string::npos) {
ret = ERROR_ENCODER_ACODEC;
srs_error("invalid acodec, must be %s, actual %s, ret=%d",
SRS_ENCODER_ACODEC, acodec.c_str(), ret);