Title: [90249] trunk/Source
- Revision
- 90249
- Author
- scher...@chromium.org
- Date
- 2011-07-01 11:30:08 -0700 (Fri, 01 Jul 2011)
Log Message
2011-07-01 Andrew Scherkus <scher...@chromium.org>
Reviewed by Darin Fisher.
Re-enable WTF_USE_WEBAUDIO_FFMPEG for Chromium
https://bugs.webkit.org/show_bug.cgi?id=63783
* features.gypi:
2011-07-01 Andrew Scherkus <scher...@chromium.org>
Reviewed by Darin Fisher.
Re-enable WTF_USE_WEBAUDIO_FFMPEG for Chromium
https://bugs.webkit.org/show_bug.cgi?id=63783
* WebCore.gyp/WebCore.gyp:
Modified Paths
Diff
Modified: trunk/Source/WebCore/ChangeLog (90248 => 90249)
--- trunk/Source/WebCore/ChangeLog 2011-07-01 18:19:50 UTC (rev 90248)
+++ trunk/Source/WebCore/ChangeLog 2011-07-01 18:30:08 UTC (rev 90249)
@@ -1,3 +1,12 @@
+2011-07-01 Andrew Scherkus <scher...@chromium.org>
+
+ Reviewed by Darin Fisher.
+
+ Re-enable WTF_USE_WEBAUDIO_FFMPEG for Chromium
+ https://bugs.webkit.org/show_bug.cgi?id=63783
+
+ * WebCore.gyp/WebCore.gyp:
+
2011-07-01 Patrick Gansterer <par...@webkit.org>
Reviewed by Daniel Bates.
Modified: trunk/Source/WebCore/WebCore.gyp/WebCore.gyp (90248 => 90249)
--- trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2011-07-01 18:19:50 UTC (rev 90248)
+++ trunk/Source/WebCore/WebCore.gyp/WebCore.gyp 2011-07-01 18:30:08 UTC (rev 90249)
@@ -1228,7 +1228,7 @@
# This directory needs to be on the include path for multiple sub-targets of webcore.
'direct_dependent_settings': {
'include_dirs': [
- '<(chromium_src_dir)/third_party/ffmpeg/patched-ffmpeg-mt',
+ '<(chromium_src_dir)/third_party/ffmpeg/patched-ffmpeg',
],
},
'dependencies': [
Modified: trunk/Source/WebKit/chromium/ChangeLog (90248 => 90249)
--- trunk/Source/WebKit/chromium/ChangeLog 2011-07-01 18:19:50 UTC (rev 90248)
+++ trunk/Source/WebKit/chromium/ChangeLog 2011-07-01 18:30:08 UTC (rev 90249)
@@ -1,3 +1,12 @@
+2011-07-01 Andrew Scherkus <scher...@chromium.org>
+
+ Reviewed by Darin Fisher.
+
+ Re-enable WTF_USE_WEBAUDIO_FFMPEG for Chromium
+ https://bugs.webkit.org/show_bug.cgi?id=63783
+
+ * features.gypi:
+
2011-07-01 Tony Chang <t...@chromium.org>
Fix the chromium build. sql is a new top level directory.
Modified: trunk/Source/WebKit/chromium/features.gypi (90248 => 90249)
--- trunk/Source/WebKit/chromium/features.gypi 2011-07-01 18:19:50 UTC (rev 90248)
+++ trunk/Source/WebKit/chromium/features.gypi 2011-07-01 18:30:08 UTC (rev 90249)
@@ -140,8 +140,7 @@
# Mac OS X uses Accelerate.framework FFT by default instead of FFmpeg.
['OS!="mac"', {
'feature_defines': [
- # TODO(scherkus): temporarily disabled due to FFmpeg update.
- 'WTF_USE_WEBAUDIO_FFMPEG=0',
+ 'WTF_USE_WEBAUDIO_FFMPEG=1',
],
'use_skia%': 1,
}],
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
