Second attempt to land ffmpeg roll.

DEPS

Index: DEPS
diff --git a/DEPS b/DEPS
index 9c94b9ede1af90bb242fc5d35cc07bd87a1e4518..8036c89b54e61c6be8b3d4333e51bea69e867cea 100644
--- a/DEPS
+++ b/DEPS
@@ -41,7 +41,12 @@ vars = {
   "libphonenumber_revision": "425",
   "libvpx_revision": "123809",
   "lss_revision": "9",
-  "ffmpeg_revision": "122092",
+
+  # These two FFmpeg variables must be updated together.  One is used for SVN
+  # checkouts and the other for Git checkouts.
+  "ffmpeg_revision": "123524",
+  "ffmpeg_hash": "54e485722e10aaa291dcf3e427b44d1ddb985259",
+
   "sfntly_revision": "118",
   "skia_revision": "3278",
   # Three lines of non-changing comments so that
@@ -252,7 +257,7 @@ deps = {
     Var("libvpx_revision"),
 
   "src/third_party/ffmpeg":
-    "/trunk/deps/third_party/ffmpeg/source@" +
+    "/trunk/deps/third_party/ffmpeg@" +
     Var("ffmpeg_revision"),
 
   "src/third_party/libjingle/source":
@@ -339,9 +344,6 @@ deps_os = {
     "src/third_party/lighttpd":
       "/trunk/deps/third_party/lighttpd@33727",
 
-    "src/third_party/ffmpeg/binaries/chromium/win/ia32":
-      "/trunk/deps/third_party/ffmpeg/binaries/win@" + Var("ffmpeg_revision"),
-
     # Chrome Frame related deps
     "src/third_party/xulrunner-sdk":
       "/trunk/deps/third_party/xulrunner-sdk@119756",