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

Unified Diff: media/media.gyp

Issue 1403893007: Adding third_party/openh264/src, build files and unittests (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 1 month 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
Index: media/media.gyp
diff --git a/media/media.gyp b/media/media.gyp
index dc23002a49458ef1296c0d4252e16b3b2f921736..38ed1ab647b96cd8bf2989565d3af23b0da94c08 100644
--- a/media/media.gyp
+++ b/media/media.gyp
@@ -1313,8 +1313,8 @@
'renderers/video_renderer_impl_unittest.cc',
'test/pipeline_integration_test.cc',
'test/pipeline_integration_test_base.cc',
- 'video/h264_poc_unittest.cc',
'video/gpu_memory_buffer_video_frame_pool_unittest.cc',
torbjorng 2015/11/05 13:18:25 Is this change intentional?
hbos_chromium 2015/11/10 14:36:47 That's due to rebase with master
+ 'video/h264_poc_unittest.cc',
],
'include_dirs': [
# Needed by media_drm_bridge.cc.

Powered by Google App Engine
This is Rietveld 408576698