Merge remote-tracking branch 'upstream/3.4' into merge-3.4

modules/python/bindings/CMakeLists.txt

@@ -29,12 +29,15 @@ foreach(m ${OPENCV_PYTHON_MODULES})
 
   # both wrapping and C++ implementation
   file(GLOB hdr2 ${OPENCV_MODULE_${m}_LOCATION}/misc/python/python_*.hpp)
+  list(SORT hdr2)
   list(APPEND opencv_hdrs ${hdr2})
   list(APPEND opencv_userdef_hdrs ${hdr2})
 
   file(GLOB hdr ${OPENCV_MODULE_${m}_LOCATION}/misc/python/shadow*.hpp)
+  list(SORT hdr)
   list(APPEND opencv_hdrs ${hdr})
   file(GLOB userdef_hdrs ${OPENCV_MODULE_${m}_LOCATION}/misc/python/pyopencv*.hpp)
+  list(SORT userdef_hdrs)
   list(APPEND opencv_userdef_hdrs ${userdef_hdrs})
 endforeach(m)
 

modules/videoio/src/cap_dshow.cpp

@@ -2741,6 +2741,7 @@ int videoInput::start(int deviceID, videoDevice *VD){
     }
 
     VIDEOINFOHEADER *pVih =  reinterpret_cast<VIDEOINFOHEADER*>(VD->pAmMediaType->pbFormat);
+    CV_Assert(pVih);
     int currentWidth    =  HEADER(pVih)->biWidth;
     int currentHeight    =  HEADER(pVih)->biHeight;