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

Unified Diff: content/renderer/media/webrtc/media_stream_track_metrics.h

Issue 2867693004: Snapshot of all changes to get jumbo in blink and content.
Patch Set: Exclude certain files from jumbo because of a Windows problem Created 3 years, 3 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
Index: content/renderer/media/webrtc/media_stream_track_metrics.h
diff --git a/content/renderer/media/webrtc/media_stream_track_metrics.h b/content/renderer/media/webrtc/media_stream_track_metrics.h
index 1a09b4eee347e0054db4e7d2a18e018d2a744c3e..0ab877b776e1b6654e3aee39d5b0b011ce309043 100644
--- a/content/renderer/media/webrtc/media_stream_track_metrics.h
+++ b/content/renderer/media/webrtc/media_stream_track_metrics.h
@@ -12,7 +12,9 @@
#include "base/sequence_checker.h"
#include "content/common/content_export.h"
+#undef FOURCC // Macro from third_party/libyuv
#include "third_party/webrtc/api/peerconnectioninterface.h"
+#undef FOURCC // Macro from third_party/webrtc
namespace webrtc {
class MediaStreamInterface;
« no previous file with comments | « content/renderer/media/video_track_adapter.cc ('k') | content/renderer/media/webrtc/media_stream_track_metrics.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698