RepoMirrors/ffmpeg
1
0
Fork 0
mirror of https://git.ffmpeg.org/ffmpeg.git synced 2025-01-12 02:19:35 +00:00
Code Issues Projects Releases Wiki Activity

fix MSVC compilation errors

Browse Source 
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>
This commit is contained in:
Mateusz 2017-12-08 08:46:52 +01:00 committed by Michael Niedermayer
parent 1215889bc1
commit 149268b47c
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libavcodec/jpegls.h
View File

@ -32,6 +32,8 @@
#include "avcodec.h" #include "avcodec.h"
#include "internal.h" #include "internal.h"
#undef near /* This file uses struct member 'near' which in windows.h is defined as empty. */
typedef struct JpeglsContext { typedef struct JpeglsContext {
AVCodecContext *avctx; AVCodecContext *avctx;
} JpeglsContext; } JpeglsContext;

2
libavcodec/mjpegdec.h
View File

@ -39,6 +39,8 @@
#include "hpeldsp.h" #include "hpeldsp.h"
#include "idctdsp.h" #include "idctdsp.h"
#undef near /* This file uses struct member 'near' which in windows.h is defined as empty. */
#define MAX_COMPONENTS 4 #define MAX_COMPONENTS 4
typedef struct MJpegDecodeContext { typedef struct MJpegDecodeContext {

6
libavcodec/mss2.c
View File

@ -464,9 +464,9 @@ static int decode_wmv9(AVCodecContext *avctx, const uint8_t *buf, int buf_size,
return 0; return 0;
} }
typedef struct Rectangle { struct Rectangle {
int coded, x, y, w, h; int coded, x, y, w, h;
} Rectangle; };
#define MAX_WMV9_RECTANGLES 20 #define MAX_WMV9_RECTANGLES 20
#define ARITH2_PADDING 2 #define ARITH2_PADDING 2
@ -485,7 +485,7 @@ static int mss2_decode_frame(AVCodecContext *avctx, void *data, int *got_frame,
int keyframe, has_wmv9, has_mv, is_rle, is_555, ret; int keyframe, has_wmv9, has_mv, is_rle, is_555, ret;
Rectangle wmv9rects[MAX_WMV9_RECTANGLES], *r; struct Rectangle wmv9rects[MAX_WMV9_RECTANGLES], *r;
int used_rects = 0, i, implicit_rect = 0, av_uninit(wmv9_mask); int used_rects = 0, i, implicit_rect = 0, av_uninit(wmv9_mask);
if ((ret = init_get_bits8(&gb, buf, buf_size)) < 0) if ((ret = init_get_bits8(&gb, buf, buf_size)) < 0)