diff options
| author | ihf@chromium.org <ihf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-01 02:25:17 +0000 |
|---|---|---|
| committer | ihf@chromium.org <ihf@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2011-07-01 02:25:17 +0000 |
| commit | 2decb263aecf4eba6e56e76ab191a6a842f2059a (patch) | |
| tree | 52a8fdc40386a4760d70789699813b8078266cff /webkit | |
| parent | a78313b4762c9c9e0d96261abf009daf7ccb83e5 (diff) | |
| download | chromium_src-2decb263aecf4eba6e56e76ab191a6a842f2059a.zip chromium_src-2decb263aecf4eba6e56e76ab191a6a842f2059a.tar.gz chromium_src-2decb263aecf4eba6e56e76ab191a6a842f2059a.tar.bz2 | |
Glue ffmpeg to Chrome
1) works for Linux, OSX, Windows
2) mostly renaming #defines
3) avcodec_thread_init is deprecated and has been removed, see
http://ffmpeg.org/pipermail/ffmpeg-cvslog/2011-February/034326.html
4) will require a rebaseline of
platform/chromium-mac/media/video-currentTime-set-expected.txt
platform/chromium-win/media/video-currentTime-set-expected.txt
with a change of
-video.currentTime.toFixed(2) == '5.82'
+video.currentTime.toFixed(2) == '5.81'
BUG=87831
TESTS=ran Theora Testsuite, media tests, WebKit media tests
Review URL: http://codereview.chromium.org/6993042
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@91259 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'webkit')
| -rw-r--r-- | webkit/tools/layout_tests/test_expectations.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/webkit/tools/layout_tests/test_expectations.txt b/webkit/tools/layout_tests/test_expectations.txt index af5dc79..f17c584 100644 --- a/webkit/tools/layout_tests/test_expectations.txt +++ b/webkit/tools/layout_tests/test_expectations.txt @@ -15,3 +15,6 @@ BUGCR86570 MAC : platform/gtk/fonts/custom-font-missing-glyphs.html = IMAGE+TEXT BUGCR86570 MAC : platform/gtk/fonts/font-face-with-complex-text.html = IMAGE+TEXT CRASH BUGCR86570 MAC : platform/mac/fast/text/myanmar-shaping.html = CRASH BUGCR86570 MAC : platform/mac/fast/text/thai-combining-mark-positioning.html = CRASH + +// needs to be disabled until http://codereview.chromium.org/6993042/ is landed and WebKit is rebased +BUGCR87831 GPU : media/video-currentTime-set.html = TEXT FAIL |