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

Unified Diff: talk/media/base/streamparams.h

Issue 1342543004: Consolidate constructormagic macros with Chromium version and remove Chromium override. (Closed) Base URL: https://chromium.googlesource.com/external/webrtc.git@master
Patch Set: Rebase. Created 5 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
« no previous file with comments | « talk/app/webrtc/videosource.cc ('k') | webrtc/base/constructormagic.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: talk/media/base/streamparams.h
diff --git a/talk/media/base/streamparams.h b/talk/media/base/streamparams.h
index e5d01778220eba9f8e6e93055cde2eae1e30d404..3c683db385e25b1b7df4b0d409f61f7aac16d9e5 100644
--- a/talk/media/base/streamparams.h
+++ b/talk/media/base/streamparams.h
@@ -49,6 +49,7 @@
#include <vector>
#include "webrtc/base/basictypes.h"
+#include "webrtc/base/constructormagic.h"
namespace cricket {
« no previous file with comments | « talk/app/webrtc/videosource.cc ('k') | webrtc/base/constructormagic.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698