lavf-cmake.diff

# HG changeset patch
# Parent 4adfbfe80ba460f784b29d1e1e8fb1e4cd898b2c

diff -r 4adfbfe80ba4 source/CMakeLists.txt
--- a/source/CMakeLists.txt	Tue Apr 28 17:07:57 2015 -0700
+++ b/source/CMakeLists.txt	Tue Apr 28 21:20:30 2015 -0700
@@ -328,10 +328,13 @@
 endif(ENABLE_MKV)
 
 option(ENABLE_LAVF "Enable LAVF decoder" OFF)
-if(ENABLE_LAVF)
-    add_definitions(-DENABLE_LAVF)
-    list(APPEND PLATFORM_LIBS avformat avcodec avutil)
-endif(ENABLE_LAVF)
+if(ENABLE_LAVF AND ENABLE_CLI)
+    find_package(FF)
+    if(FFMPEG_FOUND)
+        add_definitions(-DENABLE_LAVF)
+        list(APPEND PLATFORM_LIBS ${FFMPEG_LIBRARIES})
+    endif()
+endif()
 
 option(ENABLE_ZIMG "Enable ZImg scaling libary" OFF)
 if(ENABLE_ZIMG)
diff -r 4adfbfe80ba4 source/cmake/FindFF.cmake
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/source/cmake/FindFF.cmake	Tue Apr 28 21:20:30 2015 -0700
@@ -0,0 +1,99 @@
+# - Try to find FFMPEG
+# Once done this will define
+#  FFMPEG_FOUND - System has FFMPEG
+#  FFMPEG_INCLUDE_DIRS - The FFMPEG include directories
+#  FFMPEG_LIBRARIES - The libraries needed to use FFMPEG
+#  FFMPEG_LIBRARY_DIRS - The directory to find FFMPEG libraries
+#
+# written by Roy Shilkrot 2013 http://www.morethantechnical.com/
+# modified by Xinyue Lu 2015
+#
+
+find_package(PkgConfig)
+
+MACRO(FFMPEG_FIND varname shortname headername)
+
+  IF(NOT WIN32)
+    PKG_CHECK_MODULES(PC_${varname} "lib${shortname}")
+
+    FIND_PATH(${varname}_INCLUDE_DIR "lib${shortname}/${headername}"
+      HINTS ${PC_${varname}_INCLUDEDIR} ${PC_${varname}_INCLUDE_DIRS}
+      NO_DEFAULT_PATH
+      )
+  ELSE()
+    FIND_PATH(${varname}_INCLUDE_DIR "lib${shortname}/${headername}")
+  ENDIF()
+
+
+  IF(${${varname}_INCLUDE_DIR} STREQUAL "${varname}_INCLUDE_DIR-NOTFOUND")
+    MESSAGE(STATUS "Can't find includes for ${shortname}...")
+  ELSE()
+#    MESSAGE(STATUS "Found ${shortname} include dirs: ${${varname}_INCLUDE_DIR}")
+
+#   GET_DIRECTORY_PROPERTY(FFMPEG_PARENT DIRECTORY ${${varname}_INCLUDE_DIR} PARENT_DIRECTORY)
+    GET_FILENAME_COMPONENT(FFMPEG_PARENT ${${varname}_INCLUDE_DIR} PATH)
+    IF(WIN32)
+      SET(ENV{PKG_CONFIG_PATH} "${CMAKE_PREFIX_PATH}/lib/pkgconfig/")
+      PKG_CHECK_MODULES(PC_${varname} lib${shortname})
+    ENDIF()
+#    MESSAGE(STATUS "Using FFMpeg dir parent as hint: ${FFMPEG_PARENT}")
+
+    # NO_SYSTEM_ENVIRONMENT_PATH prevent accidently linking to dlls in $PATH
+    FIND_LIBRARY(${varname}_LIBRARIES NAMES ${shortname}
+      HINTS ${PC_${varname}_LIBDIR} ${PC_${varname}_LIBRARY_DIR} ${FFMPEG_PARENT}
+      NO_SYSTEM_ENVIRONMENT_PATH
+    )
+
+    IF(${varname}_LIBRARIES STREQUAL "${varname}_LIBRARIES-NOTFOUND")
+      MESSAGE(STATUS "Can't find lib for ${shortname}...")
+#    ELSE()
+#      MESSAGE(STATUS "Found ${shortname} libs: ${${varname}_LIBRARIES}")
+    ENDIF()
+
+    IF(NOT ${varname}_INCLUDE_DIR STREQUAL "${varname}_INCLUDE_DIR-NOTFOUND"
+      AND NOT ${varname}_LIBRARIES STREQUAL ${varname}_LIBRARIES-NOTFOUND)
+
+      MESSAGE(STATUS "${shortname}: include ${${varname}_INCLUDE_DIR} lib ${${varname}_LIBRARIES}")
+      SET(FFMPEG_${varname}_FOUND 1)
+      SET(FFMPEG_${varname}_INCLUDE_DIRS ${${varname}_INCLUDE_DIR})
+      SET(FFMPEG_${varname}_LIBS ${${varname}_LIBRARIES})
+    ELSE()
+      MESSAGE(STATUS "Can't find ${shortname}")
+    ENDIF()
+
+  ENDIF()
+
+ENDMACRO(FFMPEG_FIND)
+
+FFMPEG_FIND(LIBAVFORMAT avformat avformat.h)
+FFMPEG_FIND(LIBAVCODEC  avcodec  avcodec.h)
+FFMPEG_FIND(LIBAVUTIL   avutil   avutil.h)
+
+SET(FFMPEG_FOUND "NO")
+IF(FFMPEG_LIBAVFORMAT_FOUND AND 
+  FFMPEG_LIBAVCODEC_FOUND AND 
+  FFMPEG_LIBAVUTIL_FOUND )
+
+    SET(FFMPEG_FOUND "YES")
+
+    SET(FFMPEG_INCLUDE_DIRS ${FFMPEG_LIBAVFORMAT_INCLUDE_DIRS})
+
+    SET(FFMPEG_LIBRARY_DIRS ${FFMPEG_LIBAVFORMAT_LIBRARY_DIRS})
+
+    SET(FFMPEG_LIBRARIES
+        ${FFMPEG_LIBAVFORMAT_LIBS}
+        ${FFMPEG_LIBAVCODEC_LIBS}
+        ${FFMPEG_LIBAVUTIL_LIBS}
+  )
+
+ELSE ()
+   MESSAGE(STATUS "Could not find FFMPEG")
+ENDIF()
+
+include(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set FFMPEG_FOUND to TRUE
+# if all listed variables are TRUE
+find_package_handle_standard_args(FFMPEG DEFAULT_MSG
+                                  FFMPEG_LIBRARIES FFMPEG_INCLUDE_DIRS)
+
+mark_as_advanced(FFMPEG_INCLUDE_DIRS FFMPEG_LIBRARY_DIRS FFMPEG_LIBRARIES)