diff options
author | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-01 22:32:14 +0000 |
---|---|---|
committer | dalecurtis@google.com <dalecurtis@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-03-01 22:32:14 +0000 |
commit | 859b463585079cc5c4f5b6ae97602988538aeeec (patch) | |
tree | 2d03dc61a3f77a4aa5a6b5f212c3e8691527dbd9 /tools/checkperms/checkperms.py | |
parent | 3e1c8fedc6c736caf16ad356d6e99768da49f47c (diff) | |
download | chromium_src-859b463585079cc5c4f5b6ae97602988538aeeec.zip chromium_src-859b463585079cc5c4f5b6ae97602988538aeeec.tar.gz chromium_src-859b463585079cc5c4f5b6ae97602988538aeeec.tar.bz2 |
Second attempt to land ffmpeg roll.
Attempt 2 at landing http://codereview.chromium.org/9317096/
Same as before except for fixes in checkperms/
However, fixes have landed elsewhere for:
- mp3 decode issue.
- FrameRateNoVsyncCanvasInternalTest.fishbowl/0
BUG=110776
TEST=unittests, layouttests, trybots, perf tests...
Review URL: https://chromiumcodereview.appspot.com/9447029
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@124501 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'tools/checkperms/checkperms.py')
-rwxr-xr-x | tools/checkperms/checkperms.py | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/checkperms/checkperms.py b/tools/checkperms/checkperms.py index 60f9dc0..b2e22d4 100755 --- a/tools/checkperms/checkperms.py +++ b/tools/checkperms/checkperms.py @@ -105,7 +105,7 @@ WHITELIST_REGEX = [ 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 #### |