Merge branch '2.0release' into develop

trunk/conf/full.conf

@@ -174,6 +174,7 @@ stream_caster {
     # the listen port for stream caster.
     #       for mpegts_over_udp caster, listen at udp port. for example, 8935.
     #       for rtsp caster, listen at tcp port. for example, 554.
+    #       for flv caster, listen at tcp port. for example, 8936.
     # TODO: support listen at <[ip:]port>
     listen          8935;
     # for the rtsp caster, the rtp server local port over udp,

trunk/conf/push.flv.conf

@@ -0,0 +1,14 @@
+# push HTTP FLV to SRS.
+# @see https://github.com/simple-rtmp-server/srs/wiki/v2_CN_Streamer#push-http-flv-to-srs
+# @see full.conf for detail config.
+
+listen              1935;
+max_connections     1000;
+stream_caster {
+    enabled         on;
+    caster          flv;
+    output          rtmp://127.0.0.1/[app]/[stream];
+    listen          8936;
+}
+vhost __defaultVhost__ {
+}