--- opal_v2_2_3/src/codec/rfc2833.cxx.dtmf	2006-12-19 15:58:36.000000000 -0500
+++ opal_v2_2_3/src/codec/rfc2833.cxx	2006-12-19 15:58:45.000000000 -0500
@@ -23,6 +23,9 @@
  * Contributor(s): ______________________________________.
  *
  * $Log: rfc2833.cxx,v $
+ * Revision 2.2.2.1  2006/11/03 08:35:32  dsandras
+ * Backported fix from HEAD.
+ *
  * Revision 2.2  2002/02/19 07:35:08  robertj
  * Added OpalRFC2833 as a OpalMediaFormat variable.
  *
@@ -232,6 +235,8 @@
   }
 
   unsigned duration = actualTimestamp - transmitTimestamp;
+  if (duration == 0)
+    frame.SetMarker(TRUE);
   payload[2] = (BYTE)(duration>>8);
   payload[3] = (BYTE) duration    ;
 }
--- opal_v2_2_3/src/sip/sipcon.cxx.dtmf	2006-12-19 15:59:02.000000000 -0500
+++ opal_v2_2_3/src/sip/sipcon.cxx	2006-12-19 15:59:07.000000000 -0500
@@ -24,6 +24,9 @@
  * Contributor(s): ______________________________________.
  *
  * $Log: sipcon.cxx,v $
+ * Revision 2.120.2.20  2006/10/06 08:16:51  dsandras
+ * Backported fix from HEAD for RFC2833 support.
+ *
  * Revision 2.120.2.19  2006/08/11 07:30:27  dsandras
  * Backported patch from HEAD.
  *
@@ -1126,7 +1129,7 @@
 	    patch->AddFilter(rfc2833Handler->GetReceiveHandler(), mediaStream.GetMediaFormat());
 	  }
 	  else {
-	    patch->AddFilter(rfc2833Handler->GetTransmitHandler());
+	    patch->AddFilter(rfc2833Handler->GetTransmitHandler(), mediaStream.GetMediaFormat());
 	  }
 	}
       }