diff options
author | Campbell Barton <ideasman42@gmail.com> | 2011-10-25 15:06:52 +0400 |
---|---|---|
committer | Campbell Barton <ideasman42@gmail.com> | 2011-10-25 15:06:52 +0400 |
commit | 675076a06ef38f7e565f4867b61564431803dc8b (patch) | |
tree | 890def09f321cc67cf21e43b79ef1be8cf9188f9 /source/blender | |
parent | ff683ca5e511638da82357816a8d9e053536e2b5 (diff) |
cmake macro to set less strict flags per file - remove_strict_flags_file(file, file...)
this way we can avoid removing strict flags for all files in blenkernel.
Diffstat (limited to 'source/blender')
-rw-r--r-- | source/blender/blenkernel/intern/writeffmpeg.c | 3 | ||||
-rw-r--r-- | source/blender/imbuf/CMakeLists.txt | 11 |
2 files changed, 7 insertions, 7 deletions
diff --git a/source/blender/blenkernel/intern/writeffmpeg.c b/source/blender/blenkernel/intern/writeffmpeg.c index bdca3c8e618..da1412dac0d 100644 --- a/source/blender/blenkernel/intern/writeffmpeg.c +++ b/source/blender/blenkernel/intern/writeffmpeg.c @@ -1102,7 +1102,7 @@ IDProperty *ffmpeg_property_add(RenderData *rd, char * type, int opt_index, int idp_type = IDP_FLOAT; break; case FF_OPT_TYPE_STRING: - val.str = " "; + val.str = (char *)" "; idp_type = IDP_STRING; break; case FF_OPT_TYPE_CONST: @@ -1377,4 +1377,3 @@ void ffmpeg_verify_image_type(RenderData *rd) } #endif - diff --git a/source/blender/imbuf/CMakeLists.txt b/source/blender/imbuf/CMakeLists.txt index 1b190ae96de..a03d6ce280d 100644 --- a/source/blender/imbuf/CMakeLists.txt +++ b/source/blender/imbuf/CMakeLists.txt @@ -23,11 +23,6 @@ # # ***** 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 @@ -160,6 +155,12 @@ if(WITH_CODEC_FFMPEG) ${FFMPEG_INCLUDE_DIRS} ) add_definitions(-DWITH_FFMPEG) + + remove_strict_flags_file( + intern/indexer.c + intern/util.c + intern/anim_movie.c + ) endif() if(WITH_IMAGE_DDS) |