Merge pull request #946 from jinyu121/master

Alexey

2018-06-01 73a2c52df098ecc800255d9cf8ee5d565ef532ab

Merge pull request #946 from jinyu121/master

Fix openCV 3.4.1 highgui

 src/http_stream.cpp

@@ -44,7 +44,7 @@
using std::endl;

#include "opencv2/opencv.hpp"
#include "opencv2/highgui.hpp"
#include "opencv2/highgui/highgui.hpp"
#include "opencv2/highgui/highgui_c.h"
#include "opencv2/imgproc/imgproc_c.h"
#ifndef CV_VERSION_EPOCH
@@ -312,4 +312,4 @@
}


#endif  // OPENCV
#endif  // OPENCV