commit 0de29504ab7ac923401c8e4e154f3b72038dbcc2
author wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Feb 13 19:54:28 2014 +0000
committer wu@webrtc.org <wu@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> Thu Feb 13 19:54:28 2014 +0000
tree 36bea33cdefdfbd42abfa58731e696ed66b99905
parent 38bf249049a16233904c8617edaf0f0b6155d9a2

Revert 5545 "Update libjingle to 61514460"

> Update libjingle to 61514460
> 
> TBR=tommi@webrtc.org
> 
> Review URL: https://webrtc-codereview.appspot.com/8649004

TBR=xians@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/8669004

git-svn-id: http://webrtc.googlecode.com/svn/trunk@5547 4adac7df-926f-26a2-2b94-8c16560cd09d

talk/base/socket.h

diff --git a/talk/base/socket.h b/talk/base/socket.h
index 590645f..47f5522 100644
--- a/talk/base/socket.h
+++ b/talk/base/socket.h
@@ -185,10 +185,7 @@
     OPT_SNDBUF,      // send buffer size
     OPT_NODELAY,     // whether Nagle algorithm is enabled
     OPT_IPV6_V6ONLY, // Whether the socket is IPv6 only.
-    OPT_DSCP,        // DSCP code
-    OPT_RTP_SENDTIME_EXTN_ID,  // This is a non-traditional socket option param.
-                               // This is specific to libjingle and will be used
-                               // if SendTime option is needed at socket level.
+    OPT_DSCP         // DSCP code
   };
   virtual int GetOption(Option opt, int* value) = 0;
   virtual int SetOption(Option opt, int value) = 0;