Title: [108632] trunk/Source/WebKit/chromium
- Revision
- 108632
- Author
- [email protected]
- Date
- 2012-02-23 08:44:50 -0800 (Thu, 23 Feb 2012)
Log Message
Unreviewed, rolling out r108627 and r108630.
https://bugs.webkit.org/show_bug.cgi?id=79367
ffmpeg is creating issues and was just reverted upstream as well.
* DEPS:
Modified Paths
Diff
Modified: trunk/Source/WebKit/chromium/ChangeLog (108631 => 108632)
--- trunk/Source/WebKit/chromium/ChangeLog 2012-02-23 16:38:02 UTC (rev 108631)
+++ trunk/Source/WebKit/chromium/ChangeLog 2012-02-23 16:44:50 UTC (rev 108632)
@@ -1,5 +1,14 @@
2012-02-23 Peter Beverloo <[email protected]>
+ Unreviewed, rolling out r108627 and r108630.
+ https://bugs.webkit.org/show_bug.cgi?id=79367
+
+ ffmpeg is creating issues and was just reverted upstream as well.
+
+ * DEPS:
+
+2012-02-23 Peter Beverloo <[email protected]>
+
Unreviewed build fix. Remove the ffmpeg binary directory from the
Chromium-Windows DEPS file, following the commit done in the
Chromium repository:
Modified: trunk/Source/WebKit/chromium/DEPS (108631 => 108632)
--- trunk/Source/WebKit/chromium/DEPS 2012-02-23 16:38:02 UTC (rev 108631)
+++ trunk/Source/WebKit/chromium/DEPS 2012-02-23 16:44:50 UTC (rev 108632)
@@ -32,7 +32,7 @@
vars = {
'chromium_svn': 'http://src.chromium.org/svn/trunk/src',
- 'chromium_rev': '123195'
+ 'chromium_rev': '122745'
}
deps = {
@@ -145,6 +145,8 @@
'win': {
'third_party/cygwin':
From('chromium_deps', 'src/third_party/cygwin'),
+ 'third_party/ffmpeg/binaries/chromium/win/ia32':
+ From('chromium_deps', 'src/third_party/ffmpeg/binaries/chromium/win/ia32'),
'third_party/lighttpd':
From('chromium_deps', 'src/third_party/lighttpd'),
'third_party/nss':
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
