Roll in ffmpeg, libvpx and gyp to build libvpx on ARM

Roll new ffmpeg, libvpx and gyp. Also modify remoting.gyp so
that everything should builds.

BUG=70688, 47285
TBR=scherkus
TEST=All buildbots are green

Review URL: http://codereview.chromium.org/7621013

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@96389 0039d316-1c4b-4281-b951-d872f2087c98

DEPS

@@ -19,8 +19,8 @@ vars = {
   "nacl_chrome_ppapi_revision": "93797", # native_client/DEPS: chrome_ppapi_rev 
   "nacl_tools_revision": "5360",  # native_client/DEPS: tools_rev
   "libjingle_revision": "77",
-  "libvpx_revision": "90416",
-  "ffmpeg_revision": "96257",
+  "libvpx_revision": "96377",
+  "ffmpeg_revision": "96373",
   "sfntly_revision": "43",
   "skia_revision": "2096",
   "v8_revision": "8902",
@@ -86,7 +86,7 @@ deps = {
     (Var("googlecode_url") % "snappy") + "/trunk@37",
 
   "src/tools/gyp":
-    (Var("googlecode_url") % "gyp") + "/trunk@989",
+    (Var("googlecode_url") % "gyp") + "/trunk@990",
 
   "src/v8":
     (Var("googlecode_url") % "v8") + "/trunk@" + Var("v8_revision"),

remoting/remoting.gyp

@@ -165,6 +165,7 @@
         'remoting_base',
         'remoting_host',
         'remoting_jingle_glue',
+        '../third_party/libvpx/libvpx.gyp:libvpx',
         '../third_party/npapi/npapi.gyp:npapi',
       ],
       'sources': [
@@ -213,15 +214,6 @@
             'host/plugin/host_plugin.rc',
           ],
         }],
-        ['target_arch=="arm"', {
-          'dependencies': [
-            '../third_party/libvpx/libvpx.gyp:libvpx_lib',
-          ],
-        }, {
-          'dependencies': [
-            '../third_party/libvpx/libvpx.gyp:libvpx',
-          ],
-        }],
       ],
     },  # end of target 'remoting_host_plugin'
     {
@@ -283,7 +275,6 @@
         '../ui/ui.gyp:ui',
         '../net/net.gyp:net',
         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
-        '../third_party/libvpx/libvpx.gyp:libvpx_include',
         '../third_party/zlib/zlib.gyp:zlib',
         '../media/media.gyp:yuv_convert',
         'remoting_jingle_glue',
@@ -298,6 +289,11 @@
         '../third_party/protobuf/protobuf.gyp:protobuf_lite',
         'proto/chromotocol.gyp:chromotocol_proto_lib',
       ],
+      # TODO(hclam): Remove this and depend on libvpx directly once we remove
+      # libvpx from FFmpeg.
+      'include_dirs': [
+        '../third_party/libvpx/source/libvpx',
+      ],
       # This target needs a hard dependency because dependent targets
       # depend on chromotocol_proto_lib for headers.
       'hard_dependency': 1,