Workaround for libyuv libjingle breakage.

libjingle depends on ConvertFromI420. This was previously available
through vplib. libjingle still has access to the vplib header, but the
implementation is no longer built.

Fortunately, the libyuv wrapper can supply the implementation, if we
hack the signature to return to the unsigned int types. We'll remove
this once libjingle has been updated to use libyuv directly.

Also, roll libyuv to r100 which fixes a gyp warning on Windows.

TEST=build

Review URL: http://webrtc-codereview.appspot.com/323004

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

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 = {

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 width,
-                    int height,
+                    //int height,
+                    WebRtc_UWord32 width,
+                    WebRtc_UWord32 height,
                     uint8_t* dst_frame,
                     bool interlaced,
                     VideoRotationMode rotate);

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 width,
-                    int height,
+                    //int height,
+                    WebRtc_UWord32 width,
+                    WebRtc_UWord32 height,
                     uint8_t* dst_frame,
                     bool interlaced,
                     VideoRotationMode rotate) {

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:*',