Commit a24676e2 authored by Mathieu Malaterre's avatar Mathieu Malaterre
Browse files

BUG: Need both avcodec and avformat

parent 63e778d2
......@@ -7,7 +7,7 @@
# FFMPEG_FOUND, If false, do not try to use FFMPEG.
# also defined, but not for general use are
# FFMPEG_LIBRARY, where to find the FFMPEG library.
# FFMPEG_avformat_LIBRARY and FFMPEG_avcodec_LIBRARY, where to find the FFMPEG library.
# This is usefull to do it this way so that we can always add more libraries
# if needed to FFMPEG_LIBRARIES if ffmpeg ever changes...
......@@ -16,7 +16,11 @@ FIND_PATH(FFMPEG_INCLUDE_DIR ffmpeg/avformat.h
/usr/include
)
FIND_LIBRARY(FFMPEG_LIBRARY avformat
FIND_LIBRARY(FFMPEG_avformat_LIBRARY avformat
/usr/local/lib
/usr/lib
)
FIND_LIBRARY(FFMPEG_avcodec_LIBRARY avcodec
/usr/local/lib
/usr/lib
)
......@@ -24,7 +28,7 @@ FIND_LIBRARY(FFMPEG_LIBRARY avformat
IF(FFMPEG_INCLUDE_DIR)
IF(FFMPEG_LIBRARY)
SET( FFMPEG_FOUND "YES" )
SET( FFMPEG_LIBRARIES ${FFMPEG_LIBRARY} )
SET( FFMPEG_LIBRARIES ${FFMPEG_avcodec_LIBRARY} ${FFMPEG_avformat_LIBRARY} )
ENDIF(FFMPEG_LIBRARY)
ENDIF(FFMPEG_INCLUDE_DIR)
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment