Merge branch 'master' into devel
This commit is contained in:
commit
25b284b8da
1 file changed
+1
-1
+1
-1
@@ -89,7 +89,7 @@ IF( USE_OPENCV )
|
|||||||
ENDIF()
|
ENDIF()
|
||||||
SET_PACKAGE_PROPERTIES(OpenCV PROPERTIES URL "http://opencv.willowgarage.com" DESCRIPTION "OpenCV library support in PlaYUVerFrame" TYPE OPTIONAL)
|
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 )
|
IF( USE_FFMPEG )
|
||||||
FIND_PACKAGE( FFmpeg )
|
FIND_PACKAGE( FFmpeg )
|
||||||
SET(USE_FFMPEG ${FFMPEG_FOUND})
|
SET(USE_FFMPEG ${FFMPEG_FOUND})
|
||||||
|
|||||||
Reference in new issue
Block a user