mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
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>
This commit is contained in:
parent
1215889bc1
commit
149268b47c
@ -32,6 +32,8 @@
|
||||
#include "avcodec.h"
|
||||
#include "internal.h"
|
||||
|
||||
#undef near /* This file uses struct member 'near' which in windows.h is defined as empty. */
|
||||
|
||||
typedef struct JpeglsContext {
|
||||
AVCodecContext *avctx;
|
||||
} JpeglsContext;
|
||||
|
@ -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 {
|
||||
|
@ -464,9 +464,9 @@ static int decode_wmv9(AVCodecContext *avctx, const uint8_t *buf, int buf_size,
|
||||
return 0;
|
||||
}
|
||||
|
||||
typedef struct Rectangle {
|
||||
struct Rectangle {
|
||||
int coded, x, y, w, h;
|
||||
} Rectangle;
|
||||
};
|
||||
|
||||
#define MAX_WMV9_RECTANGLES 20
|
||||
#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;
|
||||
|
||||
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);
|
||||
|
||||
if ((ret = init_get_bits8(&gb, buf, buf_size)) < 0)
|
||||
|
Loading…
Reference in New Issue
Block a user