diff options
| author | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-05-27 17:44:21 +0400 |
|---|---|---|
| committer | Sergey Sharybin <sergey.vfx@gmail.com> | 2012-05-27 17:44:21 +0400 |
| commit | 1a8d7f4fc11aed20f1cf5b5f84ee89eba46b950d (patch) | |
| tree | 8244e128349c3a94face7c433e08d8e38cd89741 /CMakeLists.txt | |
| parent | a1091fbfa6b37d192c90866c7115a789d15de37b (diff) | |
Patch #31563: Additional include directory for FFMPEG
Fedora 16 is still using /usr/include/ffmpeg, not /usr/include to store FFmpeg's
headers. Added it to search paths.
Also remove FFmpeg include directory listed in FFMPEG_INCLUDE_DIRS twice
Patch by Arno Mayrhofer (aka azrael3000), thanks!
Diffstat (limited to 'CMakeLists.txt')
| -rw-r--r-- | CMakeLists.txt | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index f7675daf27a..4d0df909453 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -558,7 +558,7 @@ if(UNIX AND NOT APPLE) endif() mark_as_advanced(FFMPEG) - set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include) + set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include ${FFMPEG}/include/ffmpeg) mark_as_advanced(FFMPEG_LIBRARIES) set(FFMPEG_LIBPATH ${FFMPEG}/lib) set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -D__STDC_CONSTANT_MACROS") @@ -1106,7 +1106,7 @@ elseif(WIN32) if(WITH_CODEC_FFMPEG) set(FFMPEG ${LIBDIR}/ffmpeg) - set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include ${FFMPEG}/include) + set(FFMPEG_INCLUDE_DIRS ${FFMPEG}/include) if(WITH_MINGW64) set(FFMPEG_LIBRARIES avcodec.dll avformat.dll avdevice.dll avutil.dll swscale.dll swresample.dll) else() |