From 6682f0b98984e2b92049e985b21ed81b76666565 Mon Sep 17 00:00:00 2001
From: Alexey <AlexeyAB@users.noreply.github.com>
Date: Wed, 18 Jul 2018 12:11:26 +0000
Subject: [PATCH] Merge pull request #1218 from jing-vision/master

---
 src/http_stream.h |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/http_stream.h b/src/http_stream.h
index af3d399..298d339 100644
--- a/src/http_stream.h
+++ b/src/http_stream.h
@@ -9,11 +9,13 @@
 
 void send_mjpeg(IplImage* ipl, int port, int timeout, int quality);
 CvCapture* get_capture_webcam(int index);
+CvCapture* get_capture_video_stream(char *path);
 IplImage* get_webcam_frame(CvCapture *cap);
+int get_stream_fps_cpp(CvCapture *cap);
 
 image image_data_augmentation(IplImage* ipl, int w, int h,
-	int pleft, int ptop, int swidth, int sheight, int flip,
-	float jitter, float dhue, float dsat, float dexp);
+    int pleft, int ptop, int swidth, int sheight, int flip,
+    float jitter, float dhue, float dsat, float dexp);
 
 #ifdef __cplusplus
 }

--
Gitblit v1.10.0