updated FFmpeg detection

svn path=/branches/KDE4/; revision=2189

diff --git a/cmake/modules/FindLIBFFMPEG.cmake b/cmake/modules/FindLIBFFMPEG.cmake
index fc344411f5ab1add5c8f638ec107d91da30cd61d..d38ea9b6c333ee4201a6eae003aaa468c128ddb5 100644 (file)
--- a/cmake/modules/FindLIBFFMPEG.cmake
+++ b/cmake/modules/FindLIBFFMPEG.cmake
@@ -2,22 +2,27 @@
 # Find the FFMPEG includes and library
 #
 
+FIND_PROGRAM(FFMPEG_CONFIG_EXECUTABLE pkg-config)
+EXEC_PROGRAM(${FFMPEG_CONFIG_EXECUTABLE} ARGS --variable=includedir libavformat OUTPUT_VARIABLE FFMPEG_HEADER_PATH )
+MESSAGE(STATUS "Found FFmpeg header pkg-config: ${FFMPEG_CONFIG_EXECUTABLE} , ${FFMPEG_HEADER_PATH}")
+EXEC_PROGRAM(${FFMPEG_CONFIG_EXECUTABLE} ARGS --variable=libdir libavformat OUTPUT_VARIABLE FFMPEG_LIBS_PATH )
+MESSAGE(STATUS "Found FFmpeg lib pkg-config: ${FFMPEG_CONFIG_EXECUTABLE} , ${FFMPEG_LIBS_PATH}")
+
+
 FIND_PATH(LIBFFMPEG_INCLUDE_DIR 
   NAMES avformat.h
-  PATHS ${MLT_PATH}/include /usr/local/include/libavformat /usr/local/include/ffmpeg /usr/include/libavformat /usr/include/ffmpeg
+  PATHS ${FFMPEG_HEADER_PATH}/ffmpeg ${FFMPEG_HEADER_PATH}/libavformat ${FFMPEG_HEADER_PATH}/ffmpeg/libavformat
   NO_DEFAULT_PATH
 )
 
-MESSAGE(STATUS "Found FFMPEG INCLUDES: ${LIBFFMPEG_INCLUDE_DIR}")
+MESSAGE(STATUS "Found FFmpeg INCLUDES: ${LIBFFMPEG_INCLUDE_DIR}")
 
 FIND_LIBRARY(LIBFFMPEG_LIBRARY
   NAMES avformat
-  PATHS ${MLT_PATH}/lib /usr/lib /usr/local/lib
+  PATHS ${FFMPEG_LIBS_PATH}
   NO_DEFAULT_PATH
 )
 
-MESSAGE(STATUS "Found FFMPEG LIBR: ${LIBFFMPEG_LIBRARY}")
-
 IF (LIBFFMPEG_LIBRARY AND LIBFFMPEG_INCLUDE_DIR)
   SET( LIBFFMPEG_FOUND 1 )
   SET( LIBFFMPEG_LIBRARIES ${LIBFFMPEG_LIBRARY} )
@@ -27,7 +32,7 @@ ENDIF (LIBFFMPEG_LIBRARY AND LIBFFMPEG_INCLUDE_DIR)
 
 IF (LIBFFMPEG_FOUND)
   IF (NOT LIBFFMPEG_FIND_QUIETLY)
-    MESSAGE(STATUS "Found FFMPEG library: ${LIBFFMPEG_LIBRARY}")
+    MESSAGE(STATUS "Found FFmpeg library: ${LIBFFMPEG_LIBRARY}")
   ENDIF (NOT LIBFFMPEG_FIND_QUIETLY)
 ELSE (LIBFFMPEG_FOUND)
   IF (LIBFFMPEG_FIND_REQUIRED)