From e7d54c2ca9b3fe174d04ac91edb7de6af223c861 Mon Sep 17 00:00:00 2001
From: panda1986 <542638787@qq.com>
Date: Tue, 20 Jan 2015 13:52:31 +0800
Subject: [PATCH 1/2] Update srs_app_ffmpeg.cpp
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

srs develop 新增支持mp3转码后，需要添加新的acodec-libmp3lame.所以去掉srs_app_ffmpeg.cpp中对acodec的判断
---
 trunk/src/app/srs_app_ffmpeg.cpp | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/trunk/src/app/srs_app_ffmpeg.cpp b/trunk/src/app/srs_app_ffmpeg.cpp
index f949e4b75..e81ccab1c 100644
--- a/trunk/src/app/srs_app_ffmpeg.cpp
+++ b/trunk/src/app/srs_app_ffmpeg.cpp
@@ -181,12 +181,15 @@ int SrsFFMPEG::initialize_transcode(SrsConfDirective* engine)
     }
     
     if (acodec != SRS_RTMP_ENCODER_COPY && acodec != SRS_RTMP_ENCODER_NO_AUDIO) {
+        /*
+        // add new acodec libmp3lame
         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);

From 797c1b0762775f132fe3232f28abd0ab2324980d Mon Sep 17 00:00:00 2001
From: panda1986 <542638787@qq.com>
Date: Tue, 20 Jan 2015 14:06:27 +0800
Subject: [PATCH 2/2] support all acodec. not forced to aac.

---
 trunk/src/app/srs_app_ffmpeg.cpp | 9 ---------
 1 file changed, 9 deletions(-)

diff --git a/trunk/src/app/srs_app_ffmpeg.cpp b/trunk/src/app/srs_app_ffmpeg.cpp
index e81ccab1c..473fbdfb5 100644
--- a/trunk/src/app/srs_app_ffmpeg.cpp
+++ b/trunk/src/app/srs_app_ffmpeg.cpp
@@ -181,15 +181,6 @@ int SrsFFMPEG::initialize_transcode(SrsConfDirective* engine)
     }
     
     if (acodec != SRS_RTMP_ENCODER_COPY && acodec != SRS_RTMP_ENCODER_NO_AUDIO) {
-        /*
-        // add new acodec libmp3lame
-        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);