Merge pull request ossrs#296 from panda1986/develop

支持mp3音频编码
midoks · Jan 20, 2015 · 49330b9 · 49330b9
2 parents bb1331c + 797c1b0
commit 49330b9
Showing 1 changed file with 0 additions and 6 deletions.
diff --git a/trunk/src/app/srs_app_ffmpeg.cpp b/trunk/src/app/srs_app_ffmpeg.cpp
@@ -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);