From: Anthony Minessale <anthm@freeswitch.org>
Date: Tue, 27 Mar 2012 20:53:05 +0000 (-0500)
Subject: FS-4032 --resolve please try to avoid the whitespace changes by using git diff -w
X-Git-Tag: v1.2-rc1~19^2^2~38
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=07122bd17c0672922001677ef2f9c496dd8b03f7;p=thirdparty%2Ffreeswitch.git

FS-4032 --resolve please try to avoid the whitespace changes by using git diff -w
---

diff --git a/src/switch_rtp.c b/src/switch_rtp.c
index f9b2c1a7d8..5e741c4eb7 100644
--- a/src/switch_rtp.c
+++ b/src/switch_rtp.c
@@ -3008,7 +3008,10 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
 			if (rtcp_poll_status == SWITCH_STATUS_SUCCESS) {
 				rtcp_status = read_rtcp_packet(rtp_session, &rtcp_bytes, flags);
 				
-				if (rtcp_status == SWITCH_STATUS_SUCCESS && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_RTCP_PASSTHRU)) {
+				if (rtcp_status == SWITCH_STATUS_SUCCESS) {
+					switch_rtp_reset_media_timer(rtp_session);
+
+					if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_RTCP_PASSTHRU)) {
 					switch_core_session_t *session = switch_core_memory_pool_get_data(rtp_session->pool, "__session");
 					switch_channel_t *channel = switch_core_session_get_channel(session);
 
@@ -3075,6 +3078,7 @@ static int rtp_common_read(switch_rtp_t *rtp_session, switch_payload_t *payload_
 				}
 			}
 		}
+		}
 
 
 		if (bytes && rtp_session->recv_msg.header.version == 2 &&