diff --git a/README.md b/README.md index 6aef9bece..c6b2d8455 100755 --- a/README.md +++ b/README.md @@ -167,6 +167,8 @@ See also: [Performance Test Guide](https://github.com/winlinvip/simple-rtmp-serv * nginx v1.5.0: 139524 lines
### History +* v1.0, 2014-03-19, add vn/an for FFMPEG to drop video/audio for radio stream. +* v1.0, 2014-03-19, refine handshake, client support coplex handshake, add utest. * v1.0, 2014-03-16, support ARM([debian armhf, v7cpu](https://github.com/winlinvip/simple-rtmp-server/wiki/SrsLinuxArm)) with rtmp/ssl/hls/librtmp. * v1.0, 2014-03-12, finish utest for amf0 codec. * v1.0, 2014-03-06, add gperftools for mem leak detect, mem/cpu profile. diff --git a/trunk/conf/srs.conf b/trunk/conf/srs.conf index 127566be9..0e4140af3 100755 --- a/trunk/conf/srs.conf +++ b/trunk/conf/srs.conf @@ -3,19 +3,4 @@ listen 1935; vhost __defaultVhost__ { - transcode { - enabled on; - ffmpeg ./objs/ffmpeg/bin/ffmpeg; - engine vn { - enabled on; - vcodec vn; - acodec libaacplus; - abitrate 45; - asample_rate 44100; - achannels 2; - aparams { - } - output rtmp://127.0.0.1:[port]/[app]?vhost=[vhost]/[stream]_[engine]; - } - } } diff --git a/trunk/src/core/srs_core.hpp b/trunk/src/core/srs_core.hpp index 0d5f62ebe..a64bc09eb 100644 --- a/trunk/src/core/srs_core.hpp +++ b/trunk/src/core/srs_core.hpp @@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // current release version #define VERSION_MAJOR "0" #define VERSION_MINOR "9" -#define VERSION_REVISION "21" +#define VERSION_REVISION "22" #define RTMP_SIG_SRS_VERSION VERSION_MAJOR"."VERSION_MINOR"."VERSION_REVISION // server info. #define RTMP_SIG_SRS_KEY "srs"