diff options
| author | Mateusz <mateuszb@poczta.onet.pl> | 2017-12-08 08:46:52 +0100 |
|---|---|---|
| committer | Michael Niedermayer <michael@niedermayer.cc> | 2017-12-10 14:43:01 +0100 |
| commit | 149268b47c4b0f9c584771e41d266d10cf7e3bf0 (patch) | |
| tree | 0519a46f15c290249e8b7f03f2f48fdf4c2bb2bd /libavcodec/mjpegdec.h | |
| parent | 1215889bc189e1787d7135dd628b9591d237d737 (diff) | |
| download | ffmpeg-streaming-149268b47c4b0f9c584771e41d266d10cf7e3bf0.zip ffmpeg-streaming-149268b47c4b0f9c584771e41d266d10cf7e3bf0.tar.gz | |
fix MSVC compilation errors
After commit 3701d49 'error_resilience: remove avpriv_atomic usage'
we have included windows.h in much more files and we should
avoid conflicts with defines/function declarations.
Signed-off-by: Mateusz Brzostek <mateuszb@poczta.onet.pl>
Signed-off-by: Michael Niedermayer <michael@niedermayer.cc>
Diffstat (limited to 'libavcodec/mjpegdec.h')
| -rw-r--r-- | libavcodec/mjpegdec.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libavcodec/mjpegdec.h b/libavcodec/mjpegdec.h index c84a40a..c36fba5 100644 --- a/libavcodec/mjpegdec.h +++ b/libavcodec/mjpegdec.h @@ -39,6 +39,8 @@ #include "hpeldsp.h" #include "idctdsp.h" +#undef near /* This file uses struct member 'near' which in windows.h is defined as empty. */ + #define MAX_COMPONENTS 4 typedef struct MJpegDecodeContext { |
