Merge branch 'release/4.1.0'

1 files changed, 9 insertions, 8 deletions

diff --git a/src/components/media_manager/include/media_manager/video/socket_video_streamer_adapter.h b/src/components/media_manager/include/media_manager/video/socket_video_streamer_adapter.h
index e5eefed12c..ad5739bd5f 100644
--- a/src/components/media_manager/include/media_manager/video/socket_video_streamer_adapter.h
+++ b/src/components/media_manager/include/media_manager/video/socket_video_streamer_adapter.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014, Ford Motor Company
+ * Copyright (c) 2014-2015, Ford Motor Company
  * All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
@@ -34,18 +34,19 @@
 #define SRC_COMPONENTS_MEDIA_MANAGER_INCLUDE_MEDIA_MANAGER_VIDEO_SOCKET_VIDEO_STREAMER_ADAPTER_H_
 
 #include <string>
+#include <stdint.h>
+
 #include "media_manager/socket_streamer_adapter.h"
 
 namespace media_manager {
-class SocketVideoStreamerAdapter : public SocketStreamerAdapter {
-  public:
-    SocketVideoStreamerAdapter();
-    virtual ~SocketVideoStreamerAdapter();
 
-  private:
-    DISALLOW_COPY_AND_ASSIGN(SocketVideoStreamerAdapter);
+class SocketVideoStreamerAdapter : public SocketStreamerAdapter {
+ public:
+  SocketVideoStreamerAdapter(const std::string& server_address,
+                             uint16_t video_streaming_port);
+  virtual ~SocketVideoStreamerAdapter();
 };
-}  //  namespace media_manager
 
+}  //  namespace media_manager
 
 #endif  // SRC_COMPONENTS_MEDIA_MANAGER_INCLUDE_MEDIA_MANAGER_VIDEO_SOCKET_VIDEO_STREAMER_ADAPTER_H_