Fix media code to work with new ffmpeg.

DEPS

 vars = {
   # Use this googlecode_url variable only if there is an internal mirror for it.
   # If you do not know, use the full path while defining your new deps entry.
   "googlecode_url": "http://%s.googlecode.com/svn",
   "sourceforge_url": "http://%(repo)s.svn.sourceforge.net/svnroot/%(repo)s",
   "webkit_trunk": "http://svn.webkit.org/repository/webkit/trunk",
   "nacl_trunk": "http://src.chromium.org/native_client/trunk",
   "webkit_revision": "108482",
   "chromium_git": "http://git.chromium.org/git",
   "swig_revision": "69281",
@@ skipping 23 matching lines @@
       "6a8fd328bcbdaa88887a39fd9a83a006129b44dd",
   "nacl_toolchain_win_x86_newlib_hash":
       "bd8dd553c9998e7bf826f5746c8ef69c3c5e5ac7",
   "nacl_toolchain_revision": "7799",
   "pnacl_toolchain_revision": "7799",
 
   "libjingle_revision": "115",
   "libphonenumber_revision": "425",
   "libvpx_revision": "122996",
   "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": "123079",
+  "ffmpeg_hash": "8a05b9314610683d837eec3b03306ca7a894bef7",
+
   "sfntly_revision": "118",
   "skia_revision": "3216",
   # Three lines of non-changing comments so that
   # the commit queue can handle CLs rolling Skia
   # and V8 without interference from each other.
   "v8_revision": "10776",
   "webrtc_revision": "1538",
   "jsoncpp_revision": "248",
   "nss_revision": "122528",
   "rlz_revision": "59",
@@ skipping 190 matching lines @@
 
   # Make sure you update the two functional.DEPS and webdriver.DEPS too.
   "src/third_party/webdriver/pylib":
     "http://selenium.googlecode.com/svn/trunk/py@13487",
 
   "src/third_party/libvpx":
     "/trunk/deps/third_party/libvpx@" +
     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":
     (Var("googlecode_url") % "libjingle") + "/trunk@" +
     Var("libjingle_revision"),
 
   "src/third_party/libsrtp":
     "/trunk/deps/third_party/libsrtp@121481",
 
   "src/third_party/speex":
@@ skipping 66 matching lines @@
 
     "src/third_party/python_26":
       "/trunk/tools/third_party/python_26@89111",
 
     "src/third_party/psyco_win32":
       "/trunk/deps/third_party/psyco_win32@79861",
 
     "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",
     "src/chrome_frame/tools/test/reference_build/chrome_win":
       "/trunk/deps/reference_builds/chrome_win@89574",
 
     # Parses Windows PE/COFF executable format.
     "src/third_party/pefile":
       (Var("googlecode_url") % "pefile") + "/trunk@63",
 
@@ skipping 156 matching lines @@
     "pattern": ".",
     "action": ["python", "src/build/util/lastchange.py",
                "-o", "src/build/util/LASTCHANGE"],
   },
   {
     # A change to a .gyp, .gypi, or to GYP itself should run the generator.
     "pattern": ".",
     "action": ["python", "src/build/gyp_chromium"],
   },
 ]