Too many problems with new ffmpeg detection, reverting to last known good (rev 25403).

[vlc] / extras / buildsystem / cmake / include / config.cmake

diff --git a/extras/buildsystem/cmake/include/config.cmake b/extras/buildsystem/cmake/include/config.cmake
index e458c6fe27d88cb718e2a99af998195fb556e8e7..c9233634501f95735220f316cd7c43e8c2433de6 100644 (file)
--- a/extras/buildsystem/cmake/include/config.cmake
+++ b/extras/buildsystem/cmake/include/config.cmake
@@ -451,9 +451,10 @@ if(FFmpeg_FOUND)
   set( CMAKE_REQUIRED_FLAGS_saved ${CMAKE_REQUIRED_FLAGS} )
   set( CMAKE_REQUIRED_FLAGS ${FFmpeg_CFLAGS} )
 
-  vlc_check_include_files (libavcodec/avcodec.h ffmpeg/avcodec.h)
-  vlc_check_include_files (libavutil/avutil.h ffmpeg/avutil.h)
-  vlc_check_include_files (libswscale/swscale.h ffmpeg/swscale.h)
+  vlc_check_include_files (ffmpeg/avcodec.h)
+  vlc_check_include_files (ffmpeg/avutil.h)
+  vlc_check_include_files (ffmpeg/swscale.h)
+  check_include_files (swscale.h HAVE_LIBSWSCALE_TREE)
   
   check_include_files ("stdint.h;postproc/postprocess.h" HAVE_POSTPROC_POSTPROCESS_H)
   vlc_enable_modules(ffmpeg)