Merge branch 'master' into devel

This commit is contained in:
2015-07-28 19:08:05 +01:00
+1 -1
View File
@@ -89,7 +89,7 @@ IF( USE_OPENCV )
ENDIF()
SET_PACKAGE_PROPERTIES(OpenCV PROPERTIES URL "http://opencv.willowgarage.com" DESCRIPTION "OpenCV library support in PlaYUVerFrame" TYPE OPTIONAL)
OPTION( USE_FFMPEG "Add FFMPEG support" OFF )
OPTION( USE_FFMPEG "Add FFMPEG support" ON )
IF( USE_FFMPEG )
FIND_PACKAGE( FFmpeg )
SET(USE_FFMPEG ${FFMPEG_FOUND})