diff options
| author | pwestin@webrtc.org <pwestin@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-03-13 23:20:57 +0000 |
|---|---|---|
| committer | pwestin@webrtc.org <pwestin@webrtc.org@4adac7df-926f-26a2-2b94-8c16560cd09d> | 2013-03-13 23:20:57 +0000 |
| commit | 912b7f727086279bfa950dce96953fe018f49580 (patch) | |
| tree | 4afcdf076abaae606bf7f4c500b8ad76e90301e0 /video_engine/vie_impl.h | |
| parent | 40749c1740c81cf0e637f4d3434c5d24619b0580 (diff) | |
| download | webrtc-912b7f727086279bfa950dce96953fe018f49580.tar.gz | |
Revert r3667 and r3665
Review URL: https://webrtc-codereview.appspot.com/1199004
git-svn-id: http://webrtc.googlecode.com/svn/trunk/webrtc@3668 4adac7df-926f-26a2-2b94-8c16560cd09d
Diffstat (limited to 'video_engine/vie_impl.h')
| -rw-r--r-- | video_engine/vie_impl.h | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/video_engine/vie_impl.h b/video_engine/vie_impl.h index b230fba7..ca5d9031 100644 --- a/video_engine/vie_impl.h +++ b/video_engine/vie_impl.h @@ -31,7 +31,9 @@ #ifdef WEBRTC_VIDEO_ENGINE_IMAGE_PROCESS_API #include "video_engine/vie_image_process_impl.h" #endif +#ifdef WEBRTC_VIDEO_ENGINE_NETWORK_API #include "video_engine/vie_network_impl.h" +#endif #ifdef WEBRTC_VIDEO_ENGINE_RENDER_API #include "video_engine/vie_render_impl.h" #endif @@ -61,7 +63,9 @@ class VideoEngineImpl #ifdef WEBRTC_VIDEO_ENGINE_IMAGE_PROCESS_API , public ViEImageProcessImpl #endif +#ifdef WEBRTC_VIDEO_ENGINE_NETWORK_API , public ViENetworkImpl +#endif #ifdef WEBRTC_VIDEO_ENGINE_RENDER_API , public ViERenderImpl #endif @@ -90,7 +94,9 @@ class VideoEngineImpl #ifdef WEBRTC_VIDEO_ENGINE_IMAGE_PROCESS_API , ViEImageProcessImpl(ViEBaseImpl::shared_data()) #endif +#ifdef WEBRTC_VIDEO_ENGINE_NETWORK_API , ViENetworkImpl(ViEBaseImpl::shared_data()) +#endif #ifdef WEBRTC_VIDEO_ENGINE_RENDER_API , ViERenderImpl(ViEBaseImpl::shared_data()) #endif |