Cleanup: Fix build warnings with MSVC.
ffmpeg defines some of the math constants if they are not found before including any of its headers, this lead to a build warnings about M_E, M_LN2 and M_SQRT1_2 being redefined once BLI_math_base.h gets included.
This commit is contained in:
@@ -25,12 +25,6 @@
|
||||
|
||||
# include <stdlib.h>
|
||||
|
||||
# include <libavformat/avformat.h>
|
||||
# include <libavcodec/avcodec.h>
|
||||
# include <libavutil/rational.h>
|
||||
# include <libavutil/samplefmt.h>
|
||||
# include <libswscale/swscale.h>
|
||||
|
||||
# include "MEM_guardedalloc.h"
|
||||
|
||||
# include "DNA_scene_types.h"
|
||||
@@ -56,6 +50,14 @@
|
||||
|
||||
# include "IMB_imbuf.h"
|
||||
|
||||
/* This needs to be included after BLI_math_base.h otherwise it will redefine some math defines
|
||||
* like M_SQRT1_2 leading to warnings with MSVC */
|
||||
# include <libavformat/avformat.h>
|
||||
# include <libavcodec/avcodec.h>
|
||||
# include <libavutil/rational.h>
|
||||
# include <libavutil/samplefmt.h>
|
||||
# include <libswscale/swscale.h>
|
||||
|
||||
# include "ffmpeg_compat.h"
|
||||
|
||||
struct StampData;
|
||||
|
||||
Reference in New Issue
Block a user