diff --git a/DEPS b/DEPS
index 01a4458bdc..d36530fd3a 100644
--- a/DEPS
+++ b/DEPS
@@ -82,9 +82,9 @@ deps = {
 
   "trunk/third_party/jsoncpp/":
     "http://jsoncpp.svn.sourceforge.net/svnroot/jsoncpp/trunk/jsoncpp@246",
-  
+
   "trunk/third_party/libyuv":
-    (Var("googlecode_url") % "libyuv") + "/trunk@98",
+    (Var("googlecode_url") % "libyuv") + "/trunk@100",
 }
 
 deps_os = {
diff --git a/src/common_video/libyuv/include/libyuv.h b/src/common_video/libyuv/include/libyuv.h
index ab9070b65e..34d28865ea 100644
--- a/src/common_video/libyuv/include/libyuv.h
+++ b/src/common_video/libyuv/include/libyuv.h
@@ -100,10 +100,15 @@ int ConvertToI420(VideoType src_video_type,
                   bool interlaced,
                   VideoRotationMode rotate);
 
+// TODO(andrew): return to the int width and height types. This was swapped
+// temporarily to satisfy a linking error with the libjingle revision we and
+// Chrome pull, due to the removed vplib.
 int ConvertFromI420(VideoType dst_video_type,
                     const uint8_t* src_frame,
-                    int width,
-                    int height,
+                    //int width,
+                    //int height,
+                    WebRtc_UWord32 width,
+                    WebRtc_UWord32 height,
                     uint8_t* dst_frame,
                     bool interlaced,
                     VideoRotationMode rotate);
diff --git a/src/common_video/libyuv/libyuv.cc b/src/common_video/libyuv/libyuv.cc
index 36aa548fea..83ee9d9097 100644
--- a/src/common_video/libyuv/libyuv.cc
+++ b/src/common_video/libyuv/libyuv.cc
@@ -673,8 +673,10 @@ int ConvertToI420(VideoType src_video_type,
 
 int ConvertFromI420(VideoType dst_video_type,
                     const uint8_t* src_frame,
-                    int width,
-                    int height,
+                    //int width,
+                    //int height,
+                    WebRtc_UWord32 width,
+                    WebRtc_UWord32 height,
                     uint8_t* dst_frame,
                     bool interlaced,
                     VideoRotationMode rotate) {
diff --git a/webrtc.gyp b/webrtc.gyp
index 60e8a91c87..eaecbdfd74 100644
--- a/webrtc.gyp
+++ b/webrtc.gyp
@@ -13,8 +13,7 @@
       'target_name': 'All',
       'type': 'none',
       'dependencies': [
-        # TODO(andrew): re-enable when libjingle is rolled.
-        #'peerconnection/peerconnection.gyp:*',
+        'peerconnection/peerconnection.gyp:*',
         'src/common_audio/common_audio.gyp:*',
         'src/common_video/common_video.gyp:*',
         'src/modules/modules.gyp:*',