Merge branch 'master' of https://github.com/pjreddie/darknet

Joseph Redmon

2016-06-23 d7fd2acf0582020de87f49d8863d39d1744a858c

 src/image.c

@@ -365,6 +365,7 @@
    image get_image_from_stream(CvCapture *cap)
    {
        IplImage* src = cvQueryFrame(cap);
        if (!src) return make_empty_image(0,0,0);
        image im = ipl_to_image(src);
        rgbgr_image(im);
        return im;