| Message ID | 20171202205026.8516-1-mateuszb@poczta.onet.pl |
|---|---|
| State | Superseded |
| Headers | show |
On Sat, Dec 02, 2017 at 09:50:26PM +0100, Mateusz wrote: > 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> > --- > libavcodec/jpegls.h | 4 ++++ > libavcodec/mss2.c | 6 +++--- > libavformat/mxfenc.c | 2 +- > 3 files changed, 8 insertions(+), 4 deletions(-) > > diff --git a/libavcodec/jpegls.h b/libavcodec/jpegls.h > index c8997c7861..69a57b9538 100644 > --- a/libavcodec/jpegls.h > +++ b/libavcodec/jpegls.h > @@ -32,6 +32,10 @@ > #include "avcodec.h" > #include "internal.h" > > +#ifdef near > +#undef near > +#endif > + > typedef struct JpeglsContext { > AVCodecContext *avctx; > } JpeglsContext; > diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c > index 9e7cc466de..f850349a0a 100644 > --- a/libavcodec/mss2.c > +++ b/libavcodec/mss2.c > @@ -464,9 +464,9 @@ static int decode_wmv9(AVCodecContext *avctx, const uint8_t *buf, int buf_size, > return 0; > } > > -typedef struct Rectangle { > +typedef struct ff_Rectangle { Does Rect instead of ff_Rectangle work too ? The ff_ is a bit confusng as its outside how we name structs (struct identifers are capitalized) [...]
W dniu 03.12.2017 o 22:26, Michael Niedermayer pisze: > On Sat, Dec 02, 2017 at 09:50:26PM +0100, Mateusz wrote: >> 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> >> --- >> libavcodec/jpegls.h | 4 ++++ >> libavcodec/mss2.c | 6 +++--- >> libavformat/mxfenc.c | 2 +- >> 3 files changed, 8 insertions(+), 4 deletions(-) >> >> diff --git a/libavcodec/jpegls.h b/libavcodec/jpegls.h >> index c8997c7861..69a57b9538 100644 >> --- a/libavcodec/jpegls.h >> +++ b/libavcodec/jpegls.h >> @@ -32,6 +32,10 @@ >> #include "avcodec.h" >> #include "internal.h" >> >> +#ifdef near >> +#undef near >> +#endif >> + >> typedef struct JpeglsContext { >> AVCodecContext *avctx; >> } JpeglsContext; >> diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c >> index 9e7cc466de..f850349a0a 100644 >> --- a/libavcodec/mss2.c >> +++ b/libavcodec/mss2.c >> @@ -464,9 +464,9 @@ static int decode_wmv9(AVCodecContext *avctx, const uint8_t *buf, int buf_size, >> return 0; >> } >> >> -typedef struct Rectangle { >> +typedef struct ff_Rectangle { > > Does Rect instead of ff_Rectangle work too ? > > The ff_ is a bit confusng as its outside how we name structs > (struct identifers are capitalized) Yes, Rect works. I've checked also MSS2Rectangle -- works too and in mss2.c there is for example typedef struct MSS2Context Should I resent this patch with Rect or MSS2Rectangle?
diff --git a/libavcodec/jpegls.h b/libavcodec/jpegls.h index c8997c7861..69a57b9538 100644 --- a/libavcodec/jpegls.h +++ b/libavcodec/jpegls.h @@ -32,6 +32,10 @@ #include "avcodec.h" #include "internal.h" +#ifdef near +#undef near +#endif + typedef struct JpeglsContext { AVCodecContext *avctx; } JpeglsContext; diff --git a/libavcodec/mss2.c b/libavcodec/mss2.c index 9e7cc466de..f850349a0a 100644 --- a/libavcodec/mss2.c +++ b/libavcodec/mss2.c @@ -464,9 +464,9 @@ static int decode_wmv9(AVCodecContext *avctx, const uint8_t *buf, int buf_size, return 0; } -typedef struct Rectangle { +typedef struct ff_Rectangle { int coded, x, y, w, h; -} Rectangle; +} ff_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; + ff_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) diff --git a/libavformat/mxfenc.c b/libavformat/mxfenc.c index ed6ecbf541..407acdcaaa 100644 --- a/libavformat/mxfenc.c +++ b/libavformat/mxfenc.c @@ -1444,7 +1444,7 @@ static int mxf_write_header_metadata_sets(AVFormatContext *s) AVStream *st = NULL; int i; - MXFPackage packages[2] = {}; + MXFPackage packages[2] = {{NULL}}; int package_count = 2; packages[0].type = MaterialPackage; packages[1].type = SourcePackage;
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> --- libavcodec/jpegls.h | 4 ++++ libavcodec/mss2.c | 6 +++--- libavformat/mxfenc.c | 2 +- 3 files changed, 8 insertions(+), 4 deletions(-)