diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh
index 7b237de1a..6870b0714 100755
--- a/trunk/auto/options.sh
+++ b/trunk/auto/options.sh
@@ -233,11 +233,14 @@ if [ $help = yes ]; then
                           
   --with-ssl                enable rtmp complex handshake, requires openssl-devel installed.
                             to delivery h264 video and aac audio to flash player.
-  --with-hls                enable hls streaming, build nginx as http server for hls.
+  --with-hls                enable hls streaming, mux RTMP to m3u8/ts files.
+  --with-nginx              enable delivery HTTP stream with nginx.
+                            build nginx at: ./objs/nginx/sbin/nginx
   --with-http-callback      enable http hooks, build cherrypy as demo api server.
   --with-http-server        enable http server to delivery http stream.
   --with-http-api           enable http api, to manage SRS by http api.
   --with-ffmpeg             enable transcoding with ffmpeg.
+                            build ffmpeg at: ./objs/ffmpeg/bin/ffmpeg
   --with-librtmp            enable srs-librtmp, library for client.
   --with-bwtc               enable SRS bandwidth test client tool.
   --with-research           build the research tools.
@@ -251,6 +254,7 @@ if [ $help = yes ]; then
                           
   --without-ssl             disable rtmp complex handshake.
   --without-hls             disable hls, rtmp streaming only.
+  --with-nginx              disable delivery HTTP stream with nginx.
   --without-http-callback   disable http, http hooks callback.
   --without-http-server     disable http server, use external server to delivery http stream.
   --without-http-api        disable http api, only use console to manage SRS process.
diff --git a/trunk/src/app/srs_app_encoder.cpp b/trunk/src/app/srs_app_encoder.cpp
index 0565140e5..5624ad6bc 100644
--- a/trunk/src/app/srs_app_encoder.cpp
+++ b/trunk/src/app/srs_app_encoder.cpp
@@ -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);