summaryrefslogtreecommitdiffstats
path: root/webkit
diff options
context:
space:
mode:
authorfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-22 00:14:02 +0000
committerfbarchard@chromium.org <fbarchard@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2010-07-22 00:14:02 +0000
commit684f665ff630ccae011fb279276b194ef95c631e (patch)
treeca609197ac66dcc912a30898df6695b2dd2036d7 /webkit
parent27f41125a1978d29304e7582759a2857a0130a21 (diff)
downloadchromium_src-684f665ff630ccae011fb279276b194ef95c631e.zip
chromium_src-684f665ff630ccae011fb279276b194ef95c631e.tar.gz
chromium_src-684f665ff630ccae011fb279276b194ef95c631e.tar.bz2
ffmpeg update with vp3 patches.
switch to av_register_protocol2 video-played-collapse layout test fails and will be fixed later. BUG=48037 TEST=ffmpeg should still build/run Review URL: http://codereview.chromium.org/3010016 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@53281 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
-rw-r--r--webkit/tools/layout_tests/test_expectations.txt4
1 files changed, 4 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt
index a907589..ca90a74 100644
--- a/webkit/tools/layout_tests/test_expectations.txt
+++ b/webkit/tools/layout_tests/test_expectations.txt
@@ -7,3 +7,7 @@
// TODO(johnnyg): remove after upstream expectations are rolled
BUG_JOHNNYG WIN : fast/forms/input-file-directory-upload.html = TEXT
+
+// TODO: track down regression and fix or rebase
+BUG49594 SLOW : media/video-played-collapse.html = FAIL
+