Second attempt to land ffmpeg roll.

tools/checkperms/checkperms.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Makes sure files have the right permissions.
 
 Some developers have broken SCM configurations that flip the svn:executable
 permission on for no good reason. Unix developers who run ls --color will then
 see .cc files in green and get confused.
@@ skipping 87 matching lines @@
   'scons',
   'naclsdk',
 ))
 
 # File paths that contain these regexps will be whitelisted as well.
 WHITELIST_REGEX = [
     re.compile('/third_party/openssl/'),
     re.compile('/third_party/sqlite/'),
     re.compile('/third_party/xdg-utils/'),
     re.compile('/third_party/yasm/source/patched-yasm/config'),
-    re.compile('/third_party/ffmpeg/patched-ffmpeg/tools'),
+    re.compile('/third_party/ffmpeg/tools'),
 ]
 
 #### USER EDITABLE SECTION ENDS HERE ####
 
 WHITELIST_EXTENSIONS_REGEX = re.compile(r'\.(%s)' %
                                         '|'.join(WHITELIST_EXTENSIONS))
 
 WHITELIST_FILES_REGEX = re.compile(r'(%s)$' % '|'.join(WHITELIST_FILES))
 
 # Set to true for more output. This is set by the command line options.
@@ skipping 216 matching lines @@
     success = CheckDirectory(start_dir)
   if not success:
     print '\nFAILED\n'
     return 1
   print '\nSUCCESS\n'
   return 0
 
 
 if '__main__' == __name__:
   sys.exit(main(sys.argv))