Merge branch 'srs.master'

@@ -922,15 +922,17 @@ int SrsRtmpConn::process_play_control_msg(SrsConsumer* consumer, SrsMessage* msg
     // @see https://github.com/winlinvip/simple-rtmp-server/issues/106
     // @see https://github.com/winlinvip/simple-rtmp-server/issues/106
     // TODO: FIXME: response in right way, or forward in edge mode.
     // TODO: FIXME: response in right way, or forward in edge mode.
     SrsCallPacket* call = dynamic_cast<SrsCallPacket*>(pkt);
     SrsCallPacket* call = dynamic_cast<SrsCallPacket*>(pkt);
-    // only response it when transaction id not zero,
-    // for the zero means donot need response.
-    if (call && call->transaction_id > 0) {
-        SrsCallResPacket* res = new SrsCallResPacket(call->transaction_id);
-        res->command_object = SrsAmf0Any::null();
-        res->response = SrsAmf0Any::null();
-        if ((ret = rtmp->send_and_free_packet(res, 0)) != ERROR_SUCCESS) {
-            srs_warn("response call failed. ret=%d", ret);
-            return ret;
+    if (call) {
+        // only response it when transaction id not zero,
+        // for the zero means donot need response.
+        if (call->transaction_id > 0) {
+            SrsCallResPacket* res = new SrsCallResPacket(call->transaction_id);
+            res->command_object = SrsAmf0Any::null();
+            res->response = SrsAmf0Any::null();
+            if ((ret = rtmp->send_and_free_packet(res, 0)) != ERROR_SUCCESS) {
+                srs_warn("response call failed. ret=%d", ret);
+                return ret;
+            }
         }
         }
         return ret;
         return ret;
     }
     }

@@ -31,7 +31,7 @@ CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 // current release version
 // current release version
 #define VERSION_MAJOR       2
 #define VERSION_MAJOR       2
 #define VERSION_MINOR       0
 #define VERSION_MINOR       0
-#define VERSION_REVISION    23
+#define VERSION_REVISION    24
 // server info.
 // server info.
 #define RTMP_SIG_SRS_KEY "SRS"
 #define RTMP_SIG_SRS_KEY "SRS"
 #define RTMP_SIG_SRS_ROLE "origin/edge server"
 #define RTMP_SIG_SRS_ROLE "origin/edge server"