Merge branch 'master' into devel

CMakeLists.txt

@@ -102,7 +102,7 @@ ENDIF()
 OPTION( USE_OPENCV "Add OpenCV support" ON )
 SET( OPENCV_OPTFLOW_FOUND OFF )
 IF( USE_OPENCV )
-  LIST(APPEND OPENCV_MODULES core highgui imgproc video )
+  LIST(APPEND OPENCV_MODULES core highgui imgproc video videoio )
   FIND_PACKAGE( OpenCV COMPONENTS  ${OPENCV_MODULES} )
   SET(USE_OPENCV ${OpenCV_FOUND})
 ENDIF()

lib/StreamHandlerLibav.cpp

@@ -304,7 +304,7 @@ Int StreamHandlerLibav::decodeVideoPkt( Bool& gotFrame )
 {
   gotFrame = false;
 
-  Int decResult;
+  Int decResult = 0;
   if( m_cPacket.stream_index == m_iStreamIdx )
   {
 #ifdef FF_SEND_RECEIVE_API