Finally bring ffmpeg 2.1.3 to Mac OS X.

This replaces #611.

src/CMakeLists.txt

@@ -203,11 +203,15 @@ elseif(APPLE)
     XCODE_ATTRIBUTE_INFOPLIST_PREFIX_HEADER "${SM_XCODE_DIR}/plistHelper.hpp"
     XCODE_ATTRIBUTE_GCC_PREFIX_HEADER "${CMAKE_CURRENT_SOURCE_DIR}/archutils/Darwin/StepMania.pch"
     XCODE_ATTRIBUTE_GCC_ENABLE_CPP_EXCEPTIONS "NO"
-    XCODE_ATTRIBUTE_LIBRARY_SEARCH_PATHS "${SM_XCODE_DIR}/ffmpeg/lib ${SM_XCODE_DIR}/Libraries"
+    XCODE_ATTRIBUTE_LIBRARY_SEARCH_PATHS "${SM_XCODE_DIR}/Libraries"
   )
 
   sm_add_compile_definition("${SM_EXE_NAME}" _XOPEN_SOURCE)
-  
+
+  if (${HAS_FFMPEG})
+    sm_add_compile_definition("${SM_EXE_NAME}" HAVE_FFMPEG)
+  endif()
+
   if (CMAKE_BUILD_TYPE EQUAL "Debug")
     set(SM_APP_RELEASE_NAME "${SM_NAME_DEBUG}")
   elseif(CMAKE_BUILD_TYPE EQUAL "MinSizeRel")
@@ -405,14 +409,16 @@ elseif(APPLE)
     "${BZIP2_LIBRARY_RELEASE}"
     "${ICONV_LIBRARIES}"
     "pcre"
-    "avcodec"
-    "avdevice"
-    "avfilter"
-    "avformat"
-    "avutil"
-    "swresample"
-    "swscale"
   )
+
+  if(HAS_FFMPEG)
+    list(APPEND SMDATA_LINK_LIB
+      "${SM_FFMPEG_ROOT}/libavformat/libavformat.a"
+      "${SM_FFMPEG_ROOT}/libavcodec/libavcodec.a"
+      "${SM_FFMPEG_ROOT}/libswscale/libswscale.a"
+      "${SM_FFMPEG_ROOT}/libavutil/libavutil.a"
+    )
+  endif()
 else() # Unix / Linux
   # TODO: Remember to find and locate the zip archive files.
   list(FIND SMDATA_LINK_LIB "jpeg" JPEG_INDEX)
@@ -563,10 +569,16 @@ else()
       "${SM_EXTERN_DIR}/vorbis"
     )
   endif()
-list(APPEND SM_INCLUDE_DIRS
-    "${SM_XCODE_DIR}/ffmpeg/include"
+  list(APPEND SM_INCLUDE_DIRS
     "archutils/Unix"
   )
+  if(HAS_FFMPEG)
+    add_dependencies("${SM_EXE_NAME}" "ffmpeg")
+    list(APPEND SM_INCLUDE_DIRS
+      "${SM_FFMPEG_SRC_DIR}"
+      "${SM_FFMPEG_ROOT}"
+    )
+  endif()
 endif()
 
 if(WIN32)

src/archutils/Darwin/arch_setup.h

@@ -5,7 +5,6 @@
 extern "C" int sm_main( int argc, char *argv[] );
 
 #define HAVE_CXA_DEMANGLE
-#define HAVE_FFMPEG
 #define HAVE_PTHREAD_COND_TIMEDWAIT
 /* This must be defined to 1 because autoconf's AC_CHECK_DECLS macro decides to define
  * this in all cases. If only they could be consistent... */