Merge with trunk r41342
[blender-staging.git] / source / blender / blenkernel / CMakeLists.txt
index bccabd80ada8688b9770a5e8fe257de292ebd7ed..68dc8940fced2380dc07f7fd91a034110ff25500 100644 (file)
@@ -1,4 +1,3 @@
-# $Id$
 # ***** BEGIN GPL LICENSE BLOCK *****
 #
 # This program is free software; you can redistribute it and/or
 #
 # ***** END GPL LICENSE BLOCK *****
 
-if(WITH_CODEC_FFMPEG)
-       # FFMPEG gives warnigns which are hard to avoid across multiple versions.
-       remove_strict_flags()
-endif()
-
 set(INC 
        .
        ../avi
@@ -306,6 +300,10 @@ if(WITH_CODEC_FFMPEG)
                ${FFMPEG_INCLUDE_DIRS}
        )
        add_definitions(-DWITH_FFMPEG)
+
+       remove_strict_flags_file(
+               intern/writeffmpeg.c
+       )
 endif()
 
 if(WITH_PYTHON)