Xargon/ES-DE
1
0
Fork 0
mirror of https://github.com/RetroDECK/ES-DE.git synced 2024-11-21 21:55:38 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Removed detection of libavdevice from the FFmpeg CMake find module.

Browse source
This commit is contained in:
Leon Styhre 2021-05-11 17:29:14 +02:00
parent eb868055b7
commit f781abe93e
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
CMake/Packages/FindFFmpeg.cmake
View file

@ -77,7 +77,6 @@ FIND_PATH(FFMPEG_STDINT_INCLUDE_DIR stdint.h
) )
FFMPEG_FIND(LIBAVFORMAT avformat avformat.h) FFMPEG_FIND(LIBAVFORMAT avformat avformat.h)
FFMPEG_FIND(LIBAVDEVICE avdevice avdevice.h)
FFMPEG_FIND(LIBAVCODEC avcodec avcodec.h) FFMPEG_FIND(LIBAVCODEC avcodec avcodec.h)
FFMPEG_FIND(LIBAVCODEC_FFT avcodec avfft.h) FFMPEG_FIND(LIBAVCODEC_FFT avcodec avfft.h)
FFMPEG_FIND(LIBAVUTIL avutil avutil.h) FFMPEG_FIND(LIBAVUTIL avutil avutil.h)
@ -86,9 +85,8 @@ FFMPEG_FIND(LIBSWSCALE swscale swscale.h) # Not sure about the header to look fo
SET(FFMPEG_FOUND "NO") SET(FFMPEG_FOUND "NO")
IF (FFMPEG_LIBAVFORMAT_FOUND AND FFMPEG_LIBAVDEVICE_FOUND AND FFMPEG_LIBAVCODEC_FOUND AND IF (FFMPEG_LIBAVFORMAT_FOUND AND FFMPEG_LIBAVCODEC_FOUND AND FFMPEG_LIBAVUTIL_FOUND AND
FFMPEG_LIBAVUTIL_FOUND AND FFMPEG_LIBSWRESAMPLE_FOUND AND FFMPEG_LIBSWSCALE_FOUND AND FFMPEG_LIBSWRESAMPLE_FOUND AND FFMPEG_LIBSWSCALE_FOUND AND FFMPEG_STDINT_INCLUDE_DIR)
FFMPEG_STDINT_INCLUDE_DIR)
SET(FFMPEG_FOUND "YES") SET(FFMPEG_FOUND "YES")
SET(FFMPEG_INCLUDE_DIRS ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS}) SET(FFMPEG_INCLUDE_DIRS ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS})
@ -96,7 +94,6 @@ IF (FFMPEG_LIBAVFORMAT_FOUND AND FFMPEG_LIBAVDEVICE_FOUND AND FFMPEG_LIBAVCODEC_
SET(FFMPEG_LIBRARIES SET(FFMPEG_LIBRARIES
${FFMPEG_LIBAVFORMAT_LIBRARIES} ${FFMPEG_LIBAVFORMAT_LIBRARIES}
${FFMPEG_LIBAVDEVICE_LIBRARIES}
${FFMPEG_LIBAVCODEC_LIBRARIES} ${FFMPEG_LIBAVCODEC_LIBRARIES}
${FFMPEG_LIBAVUTIL_LIBRARIES} ${FFMPEG_LIBAVUTIL_LIBRARIES}
${FFMPEG_LIBSWRESAMPLE_LIBRARIES} ${FFMPEG_LIBSWRESAMPLE_LIBRARIES}