diff --git a/DEPS b/DEPS
index fe3fdcc4ce7ed0d6ceeb84391cbcdd2b6e0eb85f..bcbdb36caed6e77fc71a56887ef00569e7831703 100644
--- a/DEPS
+++ b/DEPS
@@ -11,7 +11,7 @@ vars = {
   "nacl_revision": "3365",
   "libjingle_revision": "29",
   "libvpx_revision": "60399",
-  "ffmpeg_revision": "60702",
+  "ffmpeg_revision": "60910",
 }
 
 deps = {
diff --git a/tools/generate_stubs/generate_stubs.py b/tools/generate_stubs/generate_stubs.py
index 7263c1ef13738f603e626308efe66e63be0c2764..97c8106bd66c814df05c1bc5802bdab7cbc2de8e 100755
--- a/tools/generate_stubs/generate_stubs.py
+++ b/tools/generate_stubs/generate_stubs.py
@@ -1,6 +1,6 @@
 #!/usr/bin/python
 #
-# Copyright (c) 2009 The Chromium Authors. All rights reserved.
+# Copyright (c) 2010 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
@@ -344,7 +344,16 @@ def ExtractModuleName(infile_path):
     The module name as a string.
   """
   basename = os.path.basename(infile_path)
-  return os.path.splitext(basename)[0]
+
+  # This loop continously removes suffixes of the filename separated by a "."
+  # character.
+  while 1:
+    new_basename = os.path.splitext(basename)[0]
+    if basename == new_basename:
+      break
+    else:
+      basename = new_basename
+  return basename
 
 
 def ParseSignatures(infile):