Merge branch 'master' of github.com:ZLMediaKit/ZLMediaKit into feature/transcode2

# Conflicts:
#	src/Common/MediaSource.h
#	src/Common/config.h
#	src/Rtsp/RtspMediaSourceImp.h
#	src/Rtsp/RtspMediaSourceMuxer.h
#	src/Rtsp/RtspMuxer.cpp
#	webrtc/WebRtcTransport.cpp

ext-codec/AAC.h

@@ -19,6 +19,9 @@ namespace mediakit{
 
 /**
  * aac音频通道
+ * AAC audio channel
+ 
+ * [AUTO-TRANSLATED:0d58b638]
  */
 class AACTrack : public AudioTrack {
 public:
@@ -28,6 +31,10 @@ public:
     AACTrack(int samplerate, int channel, int profile=1);
     /**
      * 通过aac extra data 构造对象
+     * Construct object through AAC extra data
+     
+     
+     * [AUTO-TRANSLATED:1fa035c8]
      */
     AACTrack(const std::string &aac_cfg);