[Bf-blender-cvs] [b764fe5] master: CMake OS X: enable FFMPEG and Quicktime by default to match release and scons.

[Brecht Van Lommel]

Commit: b764fe58c575c7c9343f635cc0cf7836c2a4e14b
Author: Brecht Van Lommel
Date:   Sun Nov 17 09:23:18 2013 +0100
http://developer.blender.org/rBb764fe58c575c7c9343f635cc0cf7836c2a4e14b

CMake OS X: enable FFMPEG and Quicktime by default to match release and scons.

===================================================================

M	CMakeLists.txt

===================================================================

diff --git a/CMakeLists.txt b/CMakeLists.txt
index a408a81..8195785 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -216,10 +216,13 @@ option(WITH_IMAGE_FRAMESERVER   "Enable image FrameServer Support for rendering"
 # Audio/Video format support
 option(WITH_CODEC_AVI           "Enable Blenders own AVI file support (raw/jpeg)" ON)
 option(WITH_CODEC_FFMPEG        "Enable FFMPeg Support (http://ffmpeg.org)" OFF)
-
 option(WITH_CODEC_SNDFILE       "Enable libsndfile Support (http://www.mega-nerd.com/libsndfile)" OFF)
+
 if(APPLE)
-	option(WITH_CODEC_QUICKTIME     "Enable Quicktime Support" OFF)
+	option(WITH_CODEC_FFMPEG        "Enable FFMPeg Support (http://ffmpeg.org)" ON)
+	option(WITH_CODEC_QUICKTIME     "Enable Quicktime Support" ON)
+else()
+	option(WITH_CODEC_FFMPEG        "Enable FFMPeg Support (http://ffmpeg.org)" OFF)
 endif()
 
 # 3D format support