Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(114)

Unified Diff: trunk/src/media/media.gyp

Issue 357903003: Revert 279958 "Revert "Revert 279650 "Add VaapiVideoEncodeAccele..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 6 years, 6 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « trunk/src/media/filters/h264_parser.cc ('k') | trunk/src/tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/media/media.gyp
===================================================================
--- trunk/src/media/media.gyp (revision 280019)
+++ trunk/src/media/media.gyp (working copy)
@@ -659,13 +659,6 @@
'formats/webm/chromeos/webm_encoder.h',
],
}],
- # For VaapiVideoEncodeAccelerator.
- ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
- 'sources': [
- 'filters/h264_bitstream_buffer.cc',
- 'filters/h264_bitstream_buffer.h',
- ],
- }],
['OS!="ios"', {
'dependencies': [
'../third_party/libyuv/libyuv.gyp:libyuv',
@@ -1230,11 +1223,6 @@
}],
],
}],
- ['target_arch != "arm" and chromeos == 1 and use_x11 == 1', {
- 'sources': [
- 'filters/h264_bitstream_buffer_unittest.cc',
- ],
- }],
['use_alsa==0', {
'sources!': [
'audio/alsa/alsa_output_unittest.cc',
« no previous file with comments | « trunk/src/media/filters/h264_parser.cc ('k') | trunk/src/tools/metrics/histograms/histograms.xml » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698