Permalink
Browse files

Update for FFmpeg compatibility with version 1.0

  • Loading branch information...
1 parent 1c6b030 commit ffb85ed99cb30d0ed292b20fd187017d27e09527 @ChristianFrisson ChristianFrisson committed Nov 4, 2012
Showing with 5 additions and 10 deletions.
  1. +5 −10 cmake/FindFFmpeg.cmake
@@ -130,22 +130,17 @@ IF (FFMPEG_LIBAVFORMAT_FOUND AND FFMPEG_LIBAVDEVICE_FOUND AND FFMPEG_LIBAVCODE
SET(FFMPEG_FOUND "YES")
SET(FFMPEG_INCLUDE_DIRS
- ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS} ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS}/libavformat
- ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS} ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS}/libavdevice
- ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS} ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS}/libavcodec
- ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS} ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS}/libavutil
- ${FFMPEG_SWSCALE_INCLUDE_DIRS} ${FFMPEG_LIBSWSCALE_INCLUDE_DIRS}/libswscale
+ ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS}
+ ${FFMPEG_LIBAVDEVICE_INCLUDE_DIRS}
+ ${FFMPEG_LIBAVCODEC_INCLUDE_DIRS}
+ ${FFMPEG_LIBAVUTIL_INCLUDE_DIRS}
+ ${FFMPEG_SWSCALE_INCLUDE_DIRS}
)
IF (${FFMPEG_STDINT_INCLUDE_DIR})
SET(FFMPEG_INCLUDE_DIRS
${FFMPEG_INCLUDE_DIRS}
${FFMPEG_STDINT_INCLUDE_DIR}
- ${FFMPEG_STDINT_INCLUDE_DIR}/libavformat
- ${FFMPEG_STDINT_INCLUDE_DIR}/libavdevice
- ${FFMPEG_STDINT_INCLUDE_DIR}/libavcodec
- ${FFMPEG_STDINT_INCLUDE_DIR}/libavutil
- ${FFMPEG_STDINT_INCLUDE_DIR}/libswscale
)
ENDIF()

0 comments on commit ffb85ed

Please sign in to comment.